From 083bf240fab810dee2d4570c74061983bf25136a Mon Sep 17 00:00:00 2001
From: Christopher Cizek <ccizek@expedia.com>
Date: Mon, 18 Mar 2019 15:00:24 -0500
Subject: [PATCH] Fix support for protobuf 3.5+, ExtensionRegistry cannot be
 null

---
 .../converter/protobuf/ProtoResponseBodyConverter.java         | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/retrofit-converters/protobuf/src/main/java/retrofit2/converter/protobuf/ProtoResponseBodyConverter.java b/retrofit-converters/protobuf/src/main/java/retrofit2/converter/protobuf/ProtoResponseBodyConverter.java
index fc840dc6..57daa759 100644
--- a/retrofit-converters/protobuf/src/main/java/retrofit2/converter/protobuf/ProtoResponseBodyConverter.java
+++ b/retrofit-converters/protobuf/src/main/java/retrofit2/converter/protobuf/ProtoResponseBodyConverter.java
@@ -36,7 +36,8 @@ final class ProtoResponseBodyConverter<T extends MessageLite>
 
   @Override public T convert(ResponseBody value) throws IOException {
     try {
-      return parser.parseFrom(value.byteStream(), registry);
+      return registry == null ? parser.parseFrom(value.byteStream())
+              : parser.parseFrom(value.byteStream(), registry);
     } catch (InvalidProtocolBufferException e) {
       throw new RuntimeException(e); // Despite extending IOException, this is data mismatch.
     } finally {
-- 
GitLab