Skip to content

Commit efb6acf

Browse files
nbradburynbradbury
committed
Pulled trunk and resolved conflicts
2 parents 33fd5da + 6357232 commit efb6acf

File tree

128 files changed

+9277
-5320
lines changed

Some content is hidden

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

128 files changed

+9277
-5320
lines changed

‎Dangerfile‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@ end
1919

2020
common_release_checker.check_internal_release_notes_changed(report_type: :message)
2121

22-
android_release_checker.check_modified_strings_on_release
23-
2422
view_changes_checker.check
2523

2624
pr_size_checker.check_diff_size(

‎WordPress/build.gradle‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -494,6 +494,8 @@ dependencies {
494494
testImplementation(libs.assertj.core)
495495
testImplementation(libs.kotlinx.coroutines.test)
496496
testImplementation(libs.turbine)
497+
testImplementation(libs.robolectric)
498+
testImplementation(libs.androidx.test.core)
497499

498500
androidTestImplementation project(path:':libs:mocks')
499501

‎WordPress/jetpack_metadata/PlayStoreStrings.po‎

Lines changed: 8 additions & 8 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_264"
14+
msgid ""
15+
"26.4:\n"
16+
"- The app icon has a single-color option to match your device’s other themed icons. #aesthetic\n"
17+
"- Large, high-resolution images are more likely to load (but might take a few seconds).\n"
18+
"- We removed HTML tags from the Reader comment editor and fixed the “Subscribe” button.\n"
19+
msgstr ""
20+
1321
msgctxt "release_note_263"
1422
msgid ""
1523
"26.3:\n"
@@ -18,14 +26,6 @@ msgid ""
1826
"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!\n"
1927
msgstr ""
2028

21-
msgctxt "release_note_262"
22-
msgid ""
23-
"26.2:\n"
24-
"- Connect your self-hosted sites to Jetpack with our new streamlined flow—available right from Stats and Notifications.\n"
25-
"- We've added support for mentions in the experimental editor—tag your friends and collaborators with ease.\n"
26-
"- Media selection just got more accessible for everyone.\n"
27-
msgstr ""
28-
2929
#. translators: Release notes for this version to be displayed in the Play Store. Limit to 500 characters including spaces and commas!
3030
#. translators: Title to be displayed in the Play Store. Limit to 30 characters including spaces and commas!
3131
msgctxt "play_store_app_title"

‎WordPress/jetpack_metadata/release_notes.txt‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
1-
* [*] Monochrome icon support for the WordPress app [#22321]
2-
* [*] Fixed high-resolution image loading issues [#22235]
1+
- The app icon has a single-color option to match your device’s other themed icons. #aesthetic
2+
- Large, high-resolution images are more likely to load (but might take a few seconds).
3+
- We removed HTML tags from the Reader comment editor and fixed the “Subscribe” button.

‎WordPress/metadata/PlayStoreStrings.po‎

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

13+
msgctxt "release_note_264"
14+
msgid ""
15+
"26.4:\n"
16+
"- The app icon has a single-color option to match your device’s other themed icons. #aesthetic\n"
17+
"- Large, high-resolution images are more likely to load (but might take a few seconds).\n"
18+
msgstr ""
19+
1320
msgctxt "release_note_263"
1421
msgid ""
1522
"26.3:\n"
@@ -20,13 +27,6 @@ msgid ""
2027
"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!\n"
2128
msgstr ""
2229

23-
msgctxt "release_note_262"
24-
msgid ""
25-
"26.2:\n"
26-
"- We've added support for mentions in the experimental editor—tag your friends and collaborators with ease.\n"
27-
"- Media selection just got more accessible for everyone.\n"
28-
msgstr ""
29-
3030
#. translators: Release notes for this version to be displayed in the Play Store. Limit to 500 characters including spaces and commas!
3131
#. translators: Shorter Release notes for this version to be displayed in the Play Store. Limit to 500 characters including spaces and commas!
3232
msgctxt "sample_post_content"

‎WordPress/metadata/release_notes.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
* [*] Monochrome icon support for the WordPress app [#22321]
2-
* [*] Fixed high-resolution image loading issues [#22235]
1+
- The app icon has a single-color option to match your device’s other themed icons. #aesthetic
2+
- Large, high-resolution images are more likely to load (but might take a few seconds).

‎WordPress/src/main/AndroidManifest.xml‎

Lines changed: 170 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -474,6 +474,10 @@
474474
android:host="public-api.wordpress.com"
475475
android:pathPattern="/mbar/.*"
476476
android:scheme="https" />
477+
<data
478+
android:host="public-api.wordpress.com"
479+
android:pathPattern="/bar/.*"
480+
android:scheme="https" />
477481
</intent-filter>
478482
</activity>
479483

@@ -581,6 +585,82 @@
581585
android:pathPattern="/site-monitoring/.*"
582586
android:scheme="http" />
583587

588+
<data
589+
android:host="wordpress.com"
590+
android:path="/read"
591+
android:scheme="https" />
592+
593+
<data
594+
android:host="wordpress.com"
595+
android:path="/read"
596+
android:scheme="http" />
597+
598+
<data
599+
android:host="wordpress.com"
600+
android:path="/discover"
601+
android:scheme="https" />
602+
603+
<data
604+
android:host="wordpress.com"
605+
android:path="/discover"
606+
android:scheme="http" />
607+
608+
<data
609+
android:host="wordpress.com"
610+
android:pathPattern="/read/feeds/.*"
611+
android:scheme="https" />
612+
613+
<data
614+
android:host="wordpress.com"
615+
android:pathPattern="/read/feeds/.*"
616+
android:scheme="http" />
617+
618+
<data
619+
android:host="wordpress.com"
620+
android:pathPattern="/reader/feeds/.*"
621+
android:scheme="https" />
622+
623+
<data
624+
android:host="wordpress.com"
625+
android:pathPattern="/reader/feeds/.*"
626+
android:scheme="http" />
627+
628+
<data
629+
android:host="wordpress.com"
630+
android:path="/read/search"
631+
android:scheme="https"
632+
tools:ignore="IntentFilterUniqueDataAttributes" />
633+
634+
<data
635+
android:host="wordpress.com"
636+
android:path="/read/search"
637+
android:scheme="http"
638+
tools:ignore="IntentFilterUniqueDataAttributes" />
639+
640+
<data
641+
android:host="wordpress.com"
642+
android:path="/reader/search"
643+
android:scheme="https"
644+
tools:ignore="IntentFilterUniqueDataAttributes" />
645+
646+
<data
647+
android:host="wordpress.com"
648+
android:path="/reader/search"
649+
android:scheme="http"
650+
tools:ignore="IntentFilterUniqueDataAttributes" />
651+
652+
<data
653+
android:host="wordpress.com"
654+
android:pathPattern="/tag/.*"
655+
android:scheme="https"
656+
tools:ignore="IntentFilterUniqueDataAttributes" />
657+
658+
<data
659+
android:host="wordpress.com"
660+
android:pathPattern="/tag/.*"
661+
android:scheme="http"
662+
tools:ignore="IntentFilterUniqueDataAttributes" />
663+
584664
</intent-filter>
585665
</activity-alias>
586666

@@ -612,61 +692,141 @@
612692
<data
613693
android:host="wordpress.com"
614694
android:pathPattern="/read/feeds/.*/posts/.*"
615-
android:scheme="https" >
695+
android:scheme="https"
696+
tools:ignore="IntentFilterUniqueDataAttributes" >
616697
</data>
617698

618699
<data
619700
android:host="wordpress.com"
620701
android:pathPattern="/read/feeds/.*/posts/.*"
621-
android:scheme="http" >
702+
android:scheme="http"
703+
tools:ignore="IntentFilterUniqueDataAttributes" >
622704
</data>
623705

624706
<data
625707
android:host="wordpress.com"
626708
android:pathPattern="/read/blogs/.*/posts/.*"
627-
android:scheme="https" >
709+
android:scheme="https"
710+
tools:ignore="IntentFilterUniqueDataAttributes" >
628711
</data>
629712

630713
<data
631714
android:host="wordpress.com"
632715
android:pathPattern="/read/blogs/.*/posts/.*"
633-
android:scheme="http" >
716+
android:scheme="http"
717+
tools:ignore="IntentFilterUniqueDataAttributes" >
634718
</data>
635719

636720
<data
637721
android:host="*.wordpress.com"
638722
android:pathPattern="/2.../../../.*"
639-
android:scheme="https" >
723+
android:scheme="https"
724+
tools:ignore="IntentFilterUniqueDataAttributes" >
640725
</data>
641726

642727
<data
643728
android:host="*.wordpress.com"
644729
android:pathPattern="/2.../../../.*"
645-
android:scheme="http" >
730+
android:scheme="http"
731+
tools:ignore="IntentFilterUniqueDataAttributes" >
646732
</data>
647733

648734
<data
649735
android:host="*.wordpress.com"
650736
android:pathPattern="/19../../../.*"
651-
android:scheme="https" >
737+
android:scheme="https"
738+
tools:ignore="IntentFilterUniqueDataAttributes" >
652739
</data>
653740

654741
<data
655742
android:host="*.wordpress.com"
656743
android:pathPattern="/19../../../.*"
657-
android:scheme="http" >
744+
android:scheme="http"
745+
tools:ignore="IntentFilterUniqueDataAttributes" >
658746
</data>
659747

660748
<data
661749
android:host="wordpress.com"
662750
android:pathPattern="/reader/feeds/.*/posts/.*"
663-
android:scheme="https" >
751+
android:scheme="https"
752+
tools:ignore="IntentFilterUniqueDataAttributes" >
664753
</data>
665754

666755
<data
667756
android:host="wordpress.com"
668757
android:pathPattern="/reader/feeds/.*/posts/.*"
669-
android:scheme="http" >
758+
android:scheme="http"
759+
tools:ignore="IntentFilterUniqueDataAttributes" >
760+
</data>
761+
762+
<data
763+
android:host="wordpress.com"
764+
android:pathPattern="/reader/blogs/.*/posts/.*"
765+
android:scheme="https"
766+
tools:ignore="IntentFilterUniqueDataAttributes" >
767+
</data>
768+
769+
<data
770+
android:host="wordpress.com"
771+
android:pathPattern="/reader/blogs/.*/posts/.*"
772+
android:scheme="http"
773+
tools:ignore="IntentFilterUniqueDataAttributes" >
774+
</data>
775+
776+
<data
777+
android:host="www.wordpress.com"
778+
android:pathPattern="/read/feeds/.*/posts/.*"
779+
android:scheme="https"
780+
tools:ignore="IntentFilterUniqueDataAttributes" >
781+
</data>
782+
783+
<data
784+
android:host="www.wordpress.com"
785+
android:pathPattern="/read/feeds/.*/posts/.*"
786+
android:scheme="http"
787+
tools:ignore="IntentFilterUniqueDataAttributes" >
788+
</data>
789+
790+
<data
791+
android:host="www.wordpress.com"
792+
android:pathPattern="/read/blogs/.*/posts/.*"
793+
android:scheme="https"
794+
tools:ignore="IntentFilterUniqueDataAttributes" >
795+
</data>
796+
797+
<data
798+
android:host="www.wordpress.com"
799+
android:pathPattern="/read/blogs/.*/posts/.*"
800+
android:scheme="http"
801+
tools:ignore="IntentFilterUniqueDataAttributes" >
802+
</data>
803+
804+
<data
805+
android:host="www.wordpress.com"
806+
android:pathPattern="/reader/feeds/.*/posts/.*"
807+
android:scheme="https"
808+
tools:ignore="IntentFilterUniqueDataAttributes" >
809+
</data>
810+
811+
<data
812+
android:host="www.wordpress.com"
813+
android:pathPattern="/reader/feeds/.*/posts/.*"
814+
android:scheme="http"
815+
tools:ignore="IntentFilterUniqueDataAttributes" >
816+
</data>
817+
818+
<data
819+
android:host="www.wordpress.com"
820+
android:pathPattern="/reader/blogs/.*/posts/.*"
821+
android:scheme="https"
822+
tools:ignore="IntentFilterUniqueDataAttributes" >
823+
</data>
824+
825+
<data
826+
android:host="www.wordpress.com"
827+
android:pathPattern="/reader/blogs/.*/posts/.*"
828+
android:scheme="http"
829+
tools:ignore="IntentFilterUniqueDataAttributes" >
670830
</data>
671831

672832
<action android:name="org.wordpress.android.action.VIEW_POST" />

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
package org.wordpress.android.support.he.model
2+
3+
data class ConversationReplyFormState(
4+
val message: String = "",
5+
val includeAppLogs: Boolean = false,
6+
val attachmentState: AttachmentState = AttachmentState(),
7+
val isBottomSheetVisible: Boolean = false,
8+
)

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
package org.wordpress.android.support.he.model
2+
3+
import org.wordpress.android.support.he.ui.SupportCategory
4+
5+
data class NewTicketFormState(
6+
val category: SupportCategory? = null,
7+
val subject: String = "",
8+
val siteAddress: String = "",
9+
val message: String = "",
10+
val includeAppLogs: Boolean = false,
11+
val attachmentState: AttachmentState = AttachmentState(),
12+
)

‎WordPress/src/main/java/org/wordpress/android/support/he/repository/HESupportRepository.kt‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,8 @@ class HESupportRepository @Inject constructor(
9797
subject: String,
9898
message: String,
9999
tags: List<String>,
100-
attachments: List<String>
100+
attachments: List<String>,
101+
encryptedLogUuids: List<String>,
101102
): CreateConversationResult = withContext(ioDispatcher) {
102103
val response = wpComApiClient.request { requestBuilder ->
103104
requestBuilder.supportTickets().createSupportTicket(
@@ -106,6 +107,7 @@ class HESupportRepository @Inject constructor(
106107
message = message,
107108
tags = tags,
108109
attachments = attachments,
110+
encryptedLogIds = encryptedLogUuids,
109111
application = APPLICATION_ID, // Only jetpack is supported
110112
)
111113
)
@@ -138,7 +140,7 @@ class HESupportRepository @Inject constructor(
138140
suspend fun addMessageToConversation(
139141
conversationId: Long,
140142
message: String,
141-
attachments: List<String>
143+
attachments: List<String>,
142144
): CreateConversationResult = withContext(ioDispatcher) {
143145
val response = wpComApiClient.request { requestBuilder ->
144146
requestBuilder.supportTickets().addMessageToSupportConversation(

0 commit comments

Comments
 (0)