diff --git a/android/plugins/network/src/main/java/com/facebook/flipper/plugins/network/FlipperOkhttpInterceptor.java b/android/plugins/network/src/main/java/com/facebook/flipper/plugins/network/FlipperOkhttpInterceptor.java index 7d09d19bc..9087ff19f 100644 --- a/android/plugins/network/src/main/java/com/facebook/flipper/plugins/network/FlipperOkhttpInterceptor.java +++ b/android/plugins/network/src/main/java/com/facebook/flipper/plugins/network/FlipperOkhttpInterceptor.java @@ -23,6 +23,7 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.Set; import java.util.UUID; import javax.annotation.Nullable; @@ -192,10 +193,7 @@ public class FlipperOkhttpInterceptor final String method = request.method(); final PartialRequestInfo partialRequest = new PartialRequestInfo(url, method); - if (!mMockResponseMap.containsKey(partialRequest)) { - return null; - } - ResponseInfo mockResponse = mMockResponseMap.get(partialRequest); + ResponseInfo mockResponse = getMockResponse(partialRequest); if (mockResponse == null) { return null; } @@ -219,6 +217,17 @@ public class FlipperOkhttpInterceptor return builder.build(); } + private ResponseInfo getMockResponse(PartialRequestInfo partialRequestInfo) { + for (Map.Entry entry : mMockResponseMap.entrySet()) { + PartialRequestInfo mockRequestInfo = entry.getKey(); + if (partialRequestInfo.first.contains(mockRequestInfo.first) + && Objects.equals(partialRequestInfo.second, mockRequestInfo.second)) { + return entry.getValue(); + } + } + return null; + } + @Nullable private ResponseInfo convertFlipperObjectRouteToResponseInfo(FlipperObject route) { final String data = route.getString("data");