Revert stopgaps related to beta server cert issue (#3396)

* Revert stopgaps related to beta server cert issue

The upstream issue with Commons beta server has been
fixed now[1]. So, there's no point in stopgapping
the issue anymore. So, revert the related changes.

This reverts fa87eb5
and df426f7 which
correspond to PRs #3350 and #3349 respectively.

[1]: https://phabricator.wikimedia.org/T243881#5861983

* Test-fix: fix the failing CI test

Author: sivaraam

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

@@ -16,10 +16,6 @@
 import com.facebook.drawee.backends.pipeline.Fresco;
 import com.facebook.imagepipeline.core.ImagePipeline;
 import com.facebook.imagepipeline.core.ImagePipelineConfig;
-import com.facebook.imagepipeline.producers.Consumer;
-import com.facebook.imagepipeline.producers.FetchState;
-import com.facebook.imagepipeline.producers.NetworkFetcher;
-import com.facebook.imagepipeline.producers.ProducerContext;
 import com.mapbox.mapboxsdk.Mapbox;
 import com.squareup.leakcanary.LeakCanary;
 import com.squareup.leakcanary.RefWatcher;
@@ -58,7 +54,6 @@
 import io.reactivex.internal.functions.Functions;
 import io.reactivex.plugins.RxJavaPlugins;
 import io.reactivex.schedulers.Schedulers;
-import okhttp3.OkHttpClient;
 import timber.log.Timber;
 
 import static fr.free.nrw.commons.data.DBOpenHelper.CONTRIBUTIONS_TABLE;
@@ -94,9 +89,6 @@ public class CommonsApplication extends Application {
 
     @Inject @Named("default_preferences") JsonKvStore defaultPrefs;
 
-    @Inject
-    OkHttpClient okHttpClient;
-
     /**
      * Constants begin
      */
@@ -162,15 +154,9 @@ public void onCreate() {
         }
 
 //        Set DownsampleEnabled to True to downsample the image in case it's heavy
-        ImagePipelineConfig.Builder imagePipelineConfigBuilder = ImagePipelineConfig.newBuilder(this)
-                .setDownsampleEnabled(true);
-
-        if(ConfigUtils.isBetaFlavour()){
-            NetworkFetcher networkFetcher=new CustomNetworkFetcher(okHttpClient);
-            imagePipelineConfigBuilder.setNetworkFetcher(networkFetcher);
-        }
-
-        ImagePipelineConfig config = imagePipelineConfigBuilder.build();
+        ImagePipelineConfig config = ImagePipelineConfig.newBuilder(this)
+                .setDownsampleEnabled(true)
+                .build();
         try {
             Fresco.initialize(this, config);
         } catch (Exception e) {

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

@@ -8,8 +8,6 @@
 import java.io.File;
 import java.io.IOException;
 
-import fr.free.nrw.commons.di.SslUtils;
-import fr.free.nrw.commons.utils.ConfigUtils;
 import okhttp3.Cache;
 import okhttp3.Interceptor;
 import okhttp3.OkHttpClient;
@@ -31,17 +29,13 @@ public final class OkHttpConnectionFactory {
 
     @NonNull
     private static OkHttpClient createClient() {
-        OkHttpClient.Builder builder = new OkHttpClient.Builder()
+        return new OkHttpClient.Builder()
                 .cookieJar(SharedPreferenceCookieManager.getInstance())
                 .cache(NET_CACHE)
                 .addInterceptor(getLoggingInterceptor())
                 .addInterceptor(new UnsuccessfulResponseInterceptor())
-                .addInterceptor(new CommonHeaderRequestInterceptor());
-
-        if(ConfigUtils.isBetaFlavour()){
-            builder.sslSocketFactory(SslUtils.INSTANCE.getTrustAllHostsSSLSocketFactory());
-        }
-        return builder.build();
+                .addInterceptor(new CommonHeaderRequestInterceptor())
+                .build();
     }
 
     private static HttpLoggingInterceptor getLoggingInterceptor() {

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

@@ -18,8 +18,6 @@
 
 import javax.inject.Named;
 import javax.inject.Singleton;
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.SSLSocketFactory;
 
 import dagger.Module;
 import dagger.Provides;
@@ -33,7 +31,6 @@
 import fr.free.nrw.commons.mwapi.UserInterface;
 import fr.free.nrw.commons.review.ReviewInterface;
 import fr.free.nrw.commons.upload.UploadInterface;
-import fr.free.nrw.commons.utils.ConfigUtils;
 import fr.free.nrw.commons.wikidata.WikidataInterface;
 import okhttp3.Cache;
 import okhttp3.HttpUrl;
@@ -61,20 +58,14 @@ public class NetworkingModule {
     public OkHttpClient provideOkHttpClient(Context context,
                                             HttpLoggingInterceptor httpLoggingInterceptor) {
         File dir = new File(context.getCacheDir(), "okHttpCache");
-        OkHttpClient.Builder builder = new OkHttpClient.Builder().connectTimeout(60, TimeUnit.SECONDS)
-                .writeTimeout(60, TimeUnit.SECONDS)
+        return new OkHttpClient.Builder().connectTimeout(60, TimeUnit.SECONDS)
+            .writeTimeout(60, TimeUnit.SECONDS)
                 .addInterceptor(httpLoggingInterceptor)
-                .readTimeout(60, TimeUnit.SECONDS)
-                .cache(new Cache(dir, OK_HTTP_CACHE_SIZE));
-
-        if(ConfigUtils.isBetaFlavour()){
-            builder.sslSocketFactory(SslUtils.INSTANCE.getTrustAllHostsSSLSocketFactory());
-        }
-        return builder.build();
+            .readTimeout(60, TimeUnit.SECONDS)
+            .cache(new Cache(dir, OK_HTTP_CACHE_SIZE))
+            .build();
     }
 
-
-
     @Provides
     @Singleton
     public HttpLoggingInterceptor provideHttpLoggingInterceptor() {