CMM-808 port categories and tags to the new generic wordpress-rs API

WordPress/src/main/java/org/wordpress/android/ui/jetpackrestconnection/JetpackConnectionHelper.kt

@@ -58,7 +58,7 @@ class JetpackConnectionHelper @Inject constructor(
         site.wpApiRestUrl ?: "${site.url}/wp-json"
 
     private inner class InvalidAuthNotifier : WpAppNotifier {
-        override suspend fun requestedWithInvalidAuthentication() {
+        override suspend fun requestedWithInvalidAuthentication(requestUrl: String) {
             appLogWrapper.d(AppLog.T.API, "$TAG: requestedWithInvalidAuthentication")
             throw IllegalArgumentException("Invalid credentials")
         }

WordPress/src/main/java/org/wordpress/android/ui/posts/EditCategoryUseCase.kt

@@ -29,6 +29,7 @@ class EditCategoryUseCase @Inject constructor(
             existingCategory.slug,
             existingCategory.description,
             parentCategoryId,
+            existingCategory.isHierarchical,
             existingCategory.postCount
         )
         val payload = RemoteTermPayload(editedCategory, siteModel)

WordPress/src/main/java/org/wordpress/android/ui/selfhostedusers/SampleUsers.kt

@@ -1,5 +1,6 @@
 package org.wordpress.android.ui.selfhostedusers
 
+import uniffi.wp_api.UserRole
 import uniffi.wp_api.UserWithEditContext
 
 /**
@@ -24,7 +25,7 @@ object SampleUsers {
         name = "Sample User",
         nickname = "User nickname",
         registeredDate = "2023-01-01",
-        roles = listOf("admin"),
+        roles = listOf(UserRole.Administrator),
         slug = "sample-user",
         url = "example.com",
         description = "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Etiam non quam viverra, viverra est vel, interdum felis. Pellentesque interdum libero quis metus pharetra ullamcorper. Morbi nec libero ligula. Quisque consectetur, purus sit amet lobortis porttitor, ligula ex imperdiet massa, in ullamcorper augue odio sit amet metus. In sollicitudin mauris et risus mollis commodo. Aliquam vel vehicula ante, nec blandit erat. Aenean non turpis porttitor orci fringilla fringilla nec ac nunc. Nulla ultrices urna ut ipsum posuere blandit. Phasellus mauris nulla, tincidunt at leo at, auctor interdum felis. Sed pharetra risus a ullamcorper dictum. Suspendisse pharetra justo molestie risus lobortis facilisis.",
@@ -45,7 +46,7 @@ object SampleUsers {
         name = "Sample User",
         nickname = "User nickname",
         registeredDate = "2023-01-01",
-        roles = listOf("contributor"),
+        roles = listOf(UserRole.Contributor),
         slug = "sample-user",
         url = "example.com",
     )
@@ -65,7 +66,7 @@ object SampleUsers {
         name = "Sample User",
         nickname = "User nickname",
         registeredDate = "2023-01-01",
-        roles = listOf("contributor", "editor", "subscriber"),
+        roles = listOf(UserRole.Contributor, UserRole.Editor, UserRole.Subscriber),
         slug = "sample-user",
         url = "example.com",
     )

WordPress/src/test/java/org/wordpress/android/ui/posts/prepublishing/PrepublishingCategoriesViewModelTest.kt

@@ -356,6 +356,7 @@ class PrepublishingCategoriesViewModelTest : BaseUnitTest() {
             "cars",
             null,
             0,
+            true,
             0
         )
     }

WordPress/src/test/java/org/wordpress/android/ui/prefs/categories/detail/CategoryDetailViewModelTest.kt

@@ -339,6 +339,7 @@ class CategoryDetailViewModelTest : BaseUnitTest() {
             "animals",
             null,
             0,
+            true,
             0
         )
     }
@@ -353,6 +354,7 @@ class CategoryDetailViewModelTest : BaseUnitTest() {
             "dog",
             null,
             1,
+            true,
             0
         )
     }

gradle/libs.versions.toml

@@ -102,7 +102,7 @@ wiremock = '2.26.3'
 wordpress-aztec = 'v2.1.4'
 wordpress-lint = '2.2.0'
 wordpress-persistent-edittext = '1.0.2'
-wordpress-rs = 'trunk-f4e2450ca5545a4909cb08273f37a7f694244921'
+wordpress-rs = 'trunk-d0c9eebab77e8701810077ac1fba7d39ef8d121f'
 wordpress-utils = '3.14.0'
 automattic-ucrop = '2.2.11'
 zendesk = '5.5.0'

libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/TermModel.java

@@ -27,6 +27,7 @@ public class TermModel extends Payload<BaseNetworkError> implements Identifiable
     @Nullable @Column private String mSlug;
     @Nullable @Column private String mDescription;
     @Column private long mParentRemoteId;
+    @Column private boolean mIsHierarchical;
     @Column private int mPostCount;
 
     @Deprecated
@@ -86,6 +87,7 @@ public TermModel(
             @Nullable String slug,
             @Nullable String description,
             long parentRemoteId,
+            boolean isHierarchical,
             int postCount) {
         this.mId = id;
         this.mLocalSiteId = localSiteId;
@@ -95,6 +97,7 @@ public TermModel(
         this.mSlug = slug;
         this.mDescription = description;
         this.mParentRemoteId = parentRemoteId;
+        this.mIsHierarchical = isHierarchical;
         this.mPostCount = postCount;
     }
 
@@ -168,6 +171,14 @@ public void setParentRemoteId(long parentRemoteId) {
         mParentRemoteId = parentRemoteId;
     }
 
+    public boolean isHierarchical() {
+        return mIsHierarchical;
+    }
+
+    public void setIsHierarchical(boolean hierarchical) {
+        mIsHierarchical = hierarchical;
+    }
+
     public int getPostCount() {
         return mPostCount;
     }

libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpapi/rs/WpApiClientProvider.kt

@@ -25,7 +25,7 @@ class WpApiClientProvider @Inject constructor(
             authProvider = authProvider,
             requestExecutor = WpRequestExecutor(uploadListener = uploadListener),
             appNotifier = object : WpAppNotifier {
-                override suspend fun requestedWithInvalidAuthentication() {
+                override suspend fun requestedWithInvalidAuthentication(requestUrl: String) {
                     wpAppNotifierHandler.notifyRequestedWithInvalidAuthentication(site)
                 }
             }