Guard topic success detection in append/create flows

Author: graycreate

app/src/main/java/me/ghui/v2er/module/append/AppendTopicActivity.java

@@ -137,9 +137,9 @@ public void handleError(GeneralError generalError) {
                 .map(s -> {
                     // First, check if this is actually a successful append
                     // (V2EX may return the topic page on success, which triggers error handler due to redirects)
-                    BaseInfo resultInfo = APIService.fruit().fromHtml(s, TopicInfo.class);
-                    if (resultInfo.isValid()) {
-                        return resultInfo;
+                    TopicInfo topicInfo = APIService.fruit().fromHtml(s, TopicInfo.class);
+                    if (isSuccessfulTopicResponse(topicInfo)) {
+                        return topicInfo;
                     }
                     // If not a valid topic, try parsing as error page
                     return APIService.fruit().fromHtml(s, AppendTopicPageInfo.class);
@@ -169,6 +169,14 @@ public void onConsume(BaseInfo baseInfo) {
                 });
     }
 
+    private boolean isSuccessfulTopicResponse(TopicInfo topicInfo) {
+        if (topicInfo == null || !topicInfo.isValid()) {
+            return false;
+        }
+        TopicInfo.Problem problem = topicInfo.getProblem();
+        return (problem == null || problem.isEmpty()) && Check.notEmpty(topicInfo.getTopicLink());
+    }
+
     @Override
     public void onAfterAppendTopic(TopicInfo topicInfo) {
         Utils.toggleKeyboard(false, mContentET);

app/src/main/java/me/ghui/v2er/module/create/CreateTopicActivity.java

@@ -205,12 +205,12 @@ public void handleError(GeneralError generalError) {
                     .map(s -> {
                         // First, check if this is actually a successful topic creation
                         // (V2EX may return the topic page on success, which triggers error handler due to redirects)
-                        BaseInfo resultInfo = APIService.fruit().fromHtml(s, TopicInfo.class);
-                        if (resultInfo.isValid()) {
-                            return resultInfo;
+                        TopicInfo topicInfo = APIService.fruit().fromHtml(s, TopicInfo.class);
+                        if (isSuccessfulTopicResponse(topicInfo)) {
+                            return topicInfo;
                         }
                         // If not a valid topic, try parsing as error pages
-                        resultInfo = APIService.fruit().fromHtml(s, CreateTopicPageInfo.class);
+                        BaseInfo resultInfo = APIService.fruit().fromHtml(s, CreateTopicPageInfo.class);
                         if (!resultInfo.isValid()) {
                             resultInfo = APIService.fruit().fromHtml(s, NewUserBannedCreateInfo.class);
                         }
@@ -244,4 +244,12 @@ private void onBannedCreateTopic(NewUserBannedCreateInfo bannedCreateInfo) {
                 }).build().show();
     }
 
+    private boolean isSuccessfulTopicResponse(TopicInfo topicInfo) {
+        if (topicInfo == null || !topicInfo.isValid()) {
+            return false;
+        }
+        TopicInfo.Problem problem = topicInfo.getProblem();
+        return (problem == null || problem.isEmpty()) && Check.notEmpty(topicInfo.getTopicLink());
+    }
+
 }