Merge pull request commons-app#763 from psh/master

Refactoring the API calls

app/build.gradle

@@ -1,6 +1,7 @@
 apply plugin: 'com.android.application'
 apply plugin: 'jacoco-android'
 apply from: 'quality.gradle'
+apply plugin: 'com.getkeepsafe.dexcount'
 
 dependencies {
     compile 'com.github.nicolas-raoul:Quadtree:ac16ea8035bf07'
@@ -13,11 +14,13 @@ dependencies {
     compile "com.android.support:support-v4:${project.supportLibVersion}"
     compile "com.android.support:appcompat-v7:${project.supportLibVersion}"
     compile "com.android.support:design:${project.supportLibVersion}"
-    compile 'com.google.code.gson:gson:2.7'
+    compile 'com.google.code.gson:gson:2.8.0'
     compile "com.jakewharton:butterknife:$BUTTERKNIFE_VERSION"
     compile 'com.github.pedrovgs:renderers:3.3.0'
     annotationProcessor "com.jakewharton:butterknife-compiler:$BUTTERKNIFE_VERSION"
     compile 'com.jakewharton.timber:timber:4.5.1'
+    compile 'com.squareup.okhttp3:okhttp:3.8.1'
+    compile 'com.squareup.okio:okio:1.13.0'
     compile ('com.mapbox.mapboxsdk:mapbox-android-sdk:5.1.0@aar'){
         transitive=true
     }
@@ -29,6 +32,9 @@ dependencies {
     testCompile ('org.robolectric:robolectric:3.3.2') {
         exclude module: 'guava'
     }
+
+    testCompile 'com.squareup.okhttp3:mockwebserver:3.8.1'
+    androidTestCompile 'com.squareup.okhttp3:mockwebserver:3.8.1'
     androidTestCompile "com.android.support:support-annotations:${project.supportLibVersion}"
     androidTestCompile 'com.android.support.test.espresso:espresso-core:2.2.2'
 

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

@@ -8,41 +8,30 @@
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
-import android.os.Build;
 import android.database.sqlite.SQLiteDatabase;
 import android.preference.PreferenceManager;
 import android.support.v4.util.LruCache;
 
 import com.facebook.drawee.backends.pipeline.Fresco;
 import com.facebook.stetho.Stetho;
-
-import fr.free.nrw.commons.caching.CacheController;
-import fr.free.nrw.commons.category.Category;
-import fr.free.nrw.commons.contributions.Contribution;
-import fr.free.nrw.commons.data.DBOpenHelper;
-import fr.free.nrw.commons.modifications.ModifierSequence;
-import fr.free.nrw.commons.auth.AccountUtil;
-import fr.free.nrw.commons.nearby.NearbyPlaces;
-
 import com.squareup.leakcanary.LeakCanary;
 
 import org.acra.ACRA;
 import org.acra.ReportingInteractionMode;
 import org.acra.annotation.ReportsCrashes;
-import org.apache.http.conn.ClientConnectionManager;
-import org.apache.http.conn.scheme.PlainSocketFactory;
-import org.apache.http.conn.scheme.Scheme;
-import org.apache.http.conn.scheme.SchemeRegistry;
-import org.apache.http.conn.ssl.SSLSocketFactory;
-import org.apache.http.impl.client.AbstractHttpClient;
-import org.apache.http.impl.client.DefaultHttpClient;
-import org.apache.http.impl.conn.tsccm.ThreadSafeClientConnManager;
-import org.apache.http.params.BasicHttpParams;
-import org.apache.http.params.CoreProtocolPNames;
 
 import java.io.File;
 import java.io.IOException;
 
+import fr.free.nrw.commons.auth.AccountUtil;
+import fr.free.nrw.commons.caching.CacheController;
+import fr.free.nrw.commons.category.Category;
+import fr.free.nrw.commons.contributions.Contribution;
+import fr.free.nrw.commons.data.DBOpenHelper;
+import fr.free.nrw.commons.modifications.ModifierSequence;
+import fr.free.nrw.commons.mwapi.ApacheHttpClientMediaWikiApi;
+import fr.free.nrw.commons.mwapi.MediaWikiApi;
+import fr.free.nrw.commons.nearby.NearbyPlaces;
 import fr.free.nrw.commons.utils.FileUtils;
 import timber.log.Timber;
 
@@ -76,9 +65,8 @@ public class CommonsApplication extends Application {
     public static final String FEEDBACK_EMAIL_SUBJECT = "Commons Android App (%s) Feedback";
 
     private static CommonsApplication instance = null;
-    private AbstractHttpClient httpClient = null;
-    private MWApi api = null;
-    LruCache<String, String> thumbnailUrlCache = new LruCache<>(1024);
+    private MediaWikiApi api = null;
+    private LruCache<String, String> thumbnailUrlCache = new LruCache<>(1024);
     private CacheController cacheData = null;
     private DBOpenHelper dbOpenHelper = null;
     private NearbyPlaces nearbyPlaces = null;
@@ -98,35 +86,13 @@ public static CommonsApplication getInstance() {
         return instance;
     }
 
-    public AbstractHttpClient getHttpClient() {
-        if (httpClient == null) {
-            httpClient = newHttpClient();
-        }
-        return httpClient;
-    }
-
-    private AbstractHttpClient newHttpClient() {
-        BasicHttpParams params = new BasicHttpParams();
-        SchemeRegistry schemeRegistry = new SchemeRegistry();
-        schemeRegistry.register(new Scheme("http", PlainSocketFactory.getSocketFactory(), 80));
-        final SSLSocketFactory sslSocketFactory = SSLSocketFactory.getSocketFactory();
-        schemeRegistry.register(new Scheme("https", sslSocketFactory, 443));
-        ClientConnectionManager cm = new ThreadSafeClientConnManager(params, schemeRegistry);
-        params.setParameter(CoreProtocolPNames.USER_AGENT, "Commons/" + BuildConfig.VERSION_NAME + " (https://mediawiki.org/wiki/Apps/Commons) Android/" + Build.VERSION.RELEASE);
-        return new DefaultHttpClient(cm, params);
-    }
-
-    public MWApi getMWApi() {
+    public MediaWikiApi getMWApi() {
         if (api == null) {
-            api = newMWApi();
+            api = new ApacheHttpClientMediaWikiApi(API_URL);
         }
         return api;
     }
 
-    private MWApi newMWApi() {
-        return new MWApi(API_URL, getHttpClient());
-    }
-
     public CacheController getCacheData() {
         if (cacheData == null) {
             cacheData = new CacheController();
@@ -174,9 +140,6 @@ public void onCreate() {
 
         Fresco.initialize(this);
 
-        // Initialize EventLogging
-        EventLog.setApp(this);
-
         //For caching area -> categories
         cacheData  = new CacheController();
     }