Skip to content

Commit 291bf87

Browse files
irfanoirfano
committed
Merge branch 'trunk' into issue/20820-update-inapp-reviews-flow
# Conflicts: # WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderPostListFragment.java
2 parents a83acfe + c4d1cf6 commit 291bf87

180 files changed

Lines changed: 9753 additions & 3344 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: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
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]
@@ -10,6 +14,7 @@
1014
* [*] Fixed a crash that occurs with Blogging Reminders [https://github.com/wordpress-mobile/WordPress-Android/pull/20845]
1115
* [*] [internal] Block Editor: Upgrade target sdk version to Android API 34 [https://github.com/wordpress-mobile/WordPress-Android/pull/20841]
1216
* [*] [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]
1318

1419
24.9
1520
-----

‎WordPress/build.gradle‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,8 @@ 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"
154156
buildConfigField "boolean", "VOICE_TO_CONTENT", "false"
155157

156158
// Override these constants in jetpack product flavor to enable/ disable features

‎WordPress/jetpack_metadata/release_notes.txt‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
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+
* [*] Fixed a rare crash on Posts List screen [https://github.com/wordpress-mobile/WordPress-Android/pull/20813]
2+
* [*] Fixed a rare crash on the Login screen [https://github.com/wordpress-mobile/WordPress-Android/pull/20821]
3+
* [*] Fix a crash that occurs when remove a user [https://github.com/wordpress-mobile/WordPress-Android/pull/20837]
4+
* [*] Fixed a rare crash on the featured image confirmation dialog [https://github.com/wordpress-mobile/WordPress-Android/pull/20836]
5+
* [*] Fixed an ANR issue on the Post List screen [https://github.com/wordpress-mobile/WordPress-Android/pull/20833]
6+
* [*] Fixed a crash that occurs with Blogging Reminders [https://github.com/wordpress-mobile/WordPress-Android/pull/20845]
7+
* [*] [internal] Block Editor: Upgrade target sdk version to Android API 34 [https://github.com/wordpress-mobile/WordPress-Android/pull/20841]
8+
* [*] [internal] In-app updates feature [https://github.com/wordpress-mobile/WordPress-Android/pull/20822]
9+
* [**] [Jetpack-only] Reader: Add a new feed dedicated to tags [https://github.com/wordpress-mobile/WordPress-Android/pull/20812]
10+

‎WordPress/metadata/release_notes.txt‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,9 @@
1-
Site names and URLs are now properly positioned for right-to-left language users. Right on.
1+
* [*] Fixed a rare crash on Posts List screen [https://github.com/wordpress-mobile/WordPress-Android/pull/20813]
2+
* [*] Fixed a rare crash on the Login screen [https://github.com/wordpress-mobile/WordPress-Android/pull/20821]
3+
* [*] Fix a crash that occurs when remove a user [https://github.com/wordpress-mobile/WordPress-Android/pull/20837]
4+
* [*] Fixed a rare crash on the featured image confirmation dialog [https://github.com/wordpress-mobile/WordPress-Android/pull/20836]
5+
* [*] Fixed an ANR issue on the Post List screen [https://github.com/wordpress-mobile/WordPress-Android/pull/20833]
6+
* [*] Fixed a crash that occurs with Blogging Reminders [https://github.com/wordpress-mobile/WordPress-Android/pull/20845]
7+
* [*] [internal] Block Editor: Upgrade target sdk version to Android API 34 [https://github.com/wordpress-mobile/WordPress-Android/pull/20841]
8+
* [*] [internal] In-app updates feature [https://github.com/wordpress-mobile/WordPress-Android/pull/20822]
9+

‎WordPress/src/main/assets/jetpack-ai-transcription-test-audio-file.m4a‎

25.4 KB
Binary file not shown.

‎WordPress/src/main/java/org/wordpress/android/datasets/wrappers/ReaderPostTableWrapper.kt‎

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ import org.wordpress.android.datasets.ReaderPostTable
55
import org.wordpress.android.models.ReaderPost
66
import org.wordpress.android.models.ReaderPostList
77
import org.wordpress.android.models.ReaderTag
8+
import org.wordpress.android.ui.reader.actions.ReaderActions.UpdateResult
9+
import org.wordpress.android.ui.reader.models.ReaderBlogIdPostId
810
import javax.inject.Inject
911

1012
@Reusable
@@ -30,6 +32,23 @@ class ReaderPostTableWrapper @Inject constructor() {
3032

3133
fun getNumPostsWithTag(readerTag: ReaderTag): Int = ReaderPostTable.getNumPostsWithTag(readerTag)
3234

33-
fun addOrUpdatePosts(readerTag: ReaderTag, posts: ReaderPostList) =
35+
fun addOrUpdatePosts(readerTag: ReaderTag?, posts: ReaderPostList) =
3436
ReaderPostTable.addOrUpdatePosts(readerTag, posts)
37+
38+
fun deletePostsWithTag(tag: ReaderTag) = ReaderPostTable.deletePostsWithTag(tag)
39+
40+
fun comparePosts(posts: ReaderPostList): UpdateResult = ReaderPostTable.comparePosts(posts)
41+
42+
fun updateBookmarkedPostPseudoId(posts: ReaderPostList) = ReaderPostTable.updateBookmarkedPostPseudoId(posts)
43+
44+
fun setGapMarkerForTag(blogId: Long, postId: Long, tag: ReaderTag) =
45+
ReaderPostTable.setGapMarkerForTag(blogId, postId, tag)
46+
47+
fun removeGapMarkerForTag(tag: ReaderTag) = ReaderPostTable.removeGapMarkerForTag(tag)
48+
49+
fun deletePostsBeforeGapMarkerForTag(tag: ReaderTag) = ReaderPostTable.deletePostsBeforeGapMarkerForTag(tag)
50+
51+
fun hasOverlap(posts: ReaderPostList?, tag: ReaderTag): Boolean = ReaderPostTable.hasOverlap(posts, tag)
52+
53+
fun getGapMarkerIdsForTag(tag: ReaderTag): ReaderBlogIdPostId? = ReaderPostTable.getGapMarkerIdsForTag(tag)
3554
}

‎WordPress/src/main/java/org/wordpress/android/models/ReaderTag.java‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,10 @@ public boolean isBookmarked() {
184184
return tagType == ReaderTagType.BOOKMARKED;
185185
}
186186

187+
public boolean isTags() {
188+
return tagType == ReaderTagType.TAGS;
189+
}
190+
187191
public boolean isDiscover() {
188192
return tagType == ReaderTagType.DEFAULT && getEndpoint().endsWith(DISCOVER_PATH);
189193
}
@@ -204,7 +208,7 @@ public boolean isA8C() {
204208
}
205209

206210
public boolean isFilterable() {
207-
return this.isFollowedSites() || this.isA8C() || this.isP2();
211+
return this.isFollowedSites() || this.isA8C() || this.isP2() || this.isTags();
208212
}
209213

210214
public boolean isListTopic() {

‎WordPress/src/main/java/org/wordpress/android/models/ReaderTagType.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ public enum ReaderTagType {
77
CUSTOM_LIST,
88
SEARCH,
99
INTERESTS,
10-
DISCOVER_POST_CARDS;
10+
DISCOVER_POST_CARDS,
11+
TAGS;
1112

1213
private static final int INT_DEFAULT = 0;
1314
private static final int INT_FOLLOWED = 1;

‎WordPress/src/main/java/org/wordpress/android/modules/WordPressGlideModule.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import javax.inject.Named
2424
@GlideModule
2525
class WordPressGlideModule : AppGlideModule() {
2626
@Inject
27-
@Named("custom-ssl")
27+
@Named("custom-ssl-custom-redirects")
2828
lateinit var requestQueue: RequestQueue
2929

3030
@Inject

‎WordPress/src/main/java/org/wordpress/android/ui/bloggingprompts/BloggingPromptsPostTagProvider.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package org.wordpress.android.ui.bloggingprompts
22

33
import org.wordpress.android.models.ReaderTag
44
import org.wordpress.android.models.ReaderTagType
5-
import org.wordpress.android.ui.reader.services.post.ReaderPostLogic
5+
import org.wordpress.android.ui.reader.repository.ReaderPostRepository
66
import org.wordpress.android.ui.reader.utils.ReaderUtilsWrapper
77
import javax.inject.Inject
88

@@ -23,7 +23,7 @@ class BloggingPromptsPostTagProvider @Inject constructor(
2323
promptIdTag,
2424
promptIdTag,
2525
promptIdTag,
26-
ReaderPostLogic.formatFullEndpointForTag(promptIdTag),
26+
ReaderPostRepository.formatFullEndpointForTag(promptIdTag),
2727
ReaderTagType.FOLLOWED,
2828
)
2929
}

0 commit comments

Comments
 (0)