commons-app#3658 Throw exception instead of allowing nullable network models onError - peek response body and throw error (commons-app#3659)

* commons-app#3658 Throw exception instead of allowing nullable network models onError - peek response body and throw error

* commons-app#3658 Throw exception instead of allowing nullable network models onError - allow for more general error response catching

Author: macgills

app/src/main/java/fr/free/nrw/commons/OkHttpConnectionFactory.java

@@ -3,9 +3,6 @@
 import androidx.annotation.NonNull;
 import java.io.File;
 import java.io.IOException;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
 import okhttp3.Cache;
 import okhttp3.Interceptor;
 import okhttp3.OkHttpClient;
@@ -24,8 +21,7 @@ public final class OkHttpConnectionFactory {
     @NonNull private static final Cache NET_CACHE = new Cache(new File(CommonsApplication.getInstance().getCacheDir(),
             CACHE_DIR_NAME), NET_CACHE_SIZE);
 
-    @NonNull
-    private static final OkHttpClient CLIENT = createClient();
+    @NonNull private static final OkHttpClient CLIENT = createClient();
 
     @NonNull public static OkHttpClient getClient() {
         return CLIENT;
@@ -44,7 +40,7 @@ private static OkHttpClient createClient() {
 
     private static HttpLoggingInterceptor getLoggingInterceptor() {
         final HttpLoggingInterceptor httpLoggingInterceptor = new HttpLoggingInterceptor()
-            .setLevel(Level.BASIC);
+                .setLevel(Level.BASIC);
 
         httpLoggingInterceptor.redactHeader("Authorization");
         httpLoggingInterceptor.redactHeader("Cookie");
@@ -53,10 +49,7 @@ private static HttpLoggingInterceptor getLoggingInterceptor() {
     }
 
     private static class CommonHeaderRequestInterceptor implements Interceptor {
-
-        @Override
-        @NonNull
-        public Response intercept(@NonNull final Chain chain) throws IOException {
+        @Override @NonNull public Response intercept(@NonNull final Chain chain) throws IOException {
             final Request request = chain.request().newBuilder()
                     .header("User-Agent", CommonsApplication.getInstance().getUserAgent())
                     .build();
@@ -65,44 +58,25 @@ public Response intercept(@NonNull final Chain chain) throws IOException {
     }
 
     public static class UnsuccessfulResponseInterceptor implements Interceptor {
-        private static final List<String> DO_NOT_INTERCEPT = Collections.singletonList(
-            "api.php?format=json&formatversion=2&errorformat=plaintext&action=upload&ignorewarnings=1");
 
         private static final String ERRORS_PREFIX = "{\"error";
 
-        @Override
-        @NonNull
-        public Response intercept(@NonNull final Chain chain) throws IOException {
+        @Override @NonNull public Response intercept(@NonNull final Chain chain) throws IOException {
             final Response rsp = chain.proceed(chain.request());
-
-            // Do not intercept certain requests and let the caller handle the errors
-            if(isExcludedUrl(chain.request())) {
-                return rsp;
-            }
             if (rsp.isSuccessful()) {
                 try (final ResponseBody responseBody = rsp.peekBody(ERRORS_PREFIX.length())) {
-                    if (ERRORS_PREFIX.equals(responseBody.string())) {
+                    if (ERRORS_PREFIX.equals(responseBody.string())){
                         try (final ResponseBody body = rsp.body()) {
                             throw new IOException(body.string());
                         }
                     }
-                } catch (final IOException e) {
+                }catch (final IOException e){
                     Timber.e(e);
                 }
                 return rsp;
             }
             throw new HttpStatusException(rsp);
         }
-
-        private boolean isExcludedUrl(final Request request) {
-            final String requestUrl = request.url().toString();
-            for(final String url: DO_NOT_INTERCEPT) {
-                if(requestUrl.contains(url)) {
-                    return true;
-                }
-            }
-            return false;
-        }
     }
 
     private OkHttpConnectionFactory() {