fix #502 获取String类型数据时，自动去除换行符等转译字符，如获取h5网页内容

liujingxing · Aug 20, 2024 · b809e04 · b809e04
1 parent f946e4b
commit b809e04
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/.../converter-serialization/src/main/java/rxhttp/wrapper/converter/SerializationConverter.kt b/.../converter-serialization/src/main/java/rxhttp/wrapper/converter/SerializationConverter.kt
@@ -28,9 +28,6 @@ class SerializationConverter(
         if (needDecodeResult) {
             json = RxHttpPlugins.onResultDecoder(json)
         }
-        if (type == String::class.java) {
-            return json as T
-        }
         val serializer = format.serializersModule.serializer(type)
         return format.decodeFromString(serializer, json) as T
     }

diff --git a/rxhttp/src/main/java/rxhttp/wrapper/converter/GsonConverter.java b/rxhttp/src/main/java/rxhttp/wrapper/converter/GsonConverter.java
@@ -52,16 +52,17 @@ public static GsonConverter create(Gson gson, MediaType contentType) {
     }
 
     @NotNull
-    @SuppressWarnings("unchecked")
     @Override
     public <T> T convert(@NotNull ResponseBody body, @NotNull Type type, boolean needDecodeResult) throws IOException {
         try {
-            String result = body.string();
+            T t;
             if (needDecodeResult) {
+                String result = body.string();
                 result = RxHttpPlugins.onResultDecoder(result);
+                t = gson.fromJson(result, type);
+            } else {
+                t = gson.fromJson(body.charStream(), type);
             }
-            if (type == String.class) return (T) result;
-            T t = gson.fromJson(result, type);
             if (t == null) {
                 throw new IllegalStateException("GsonConverter Could not deserialize body as " + type);
             }