From edaa0dd05a3e43ecc1a0c5b744338b4c8ae4e531 Mon Sep 17 00:00:00 2001
From: maskara <maskara@zeta.tech>
Date: Fri, 1 Jun 2018 01:15:28 +0530
Subject: [PATCH] Fix build

---
 .../free/nrw/commons/CommonsApplication.java  |  1 +
 .../commons/di/CommonsApplicationModule.java  | 22 +++----------------
 .../free/nrw/commons/di/NetworkingModule.java |  2 +-
 .../nrw/commons/upload/ShareActivity.java     |  4 ----
 4 files changed, 5 insertions(+), 24 deletions(-)

diff --git a/app/src/main/java/fr/free/nrw/commons/CommonsApplication.java b/app/src/main/java/fr/free/nrw/commons/CommonsApplication.java
index 57cb5fad1..ab6018581 100644
--- a/app/src/main/java/fr/free/nrw/commons/CommonsApplication.java
+++ b/app/src/main/java/fr/free/nrw/commons/CommonsApplication.java
@@ -21,6 +21,7 @@ import java.io.File;
 import javax.inject.Inject;
 import javax.inject.Named;
 
+import fr.free.nrw.commons.BuildConfig;
 import fr.free.nrw.commons.auth.SessionManager;
 import fr.free.nrw.commons.category.CategoryDao;
 import fr.free.nrw.commons.contributions.ContributionDao;
diff --git a/app/src/main/java/fr/free/nrw/commons/di/CommonsApplicationModule.java b/app/src/main/java/fr/free/nrw/commons/di/CommonsApplicationModule.java
index c5b9f0169..86cce9c03 100644
--- a/app/src/main/java/fr/free/nrw/commons/di/CommonsApplicationModule.java
+++ b/app/src/main/java/fr/free/nrw/commons/di/CommonsApplicationModule.java
@@ -13,10 +13,13 @@ import javax.inject.Singleton;
 
 import dagger.Module;
 import dagger.Provides;
+
+import fr.free.nrw.commons.BuildConfig;
 import fr.free.nrw.commons.auth.AccountUtil;
 import fr.free.nrw.commons.auth.SessionManager;
 import fr.free.nrw.commons.data.DBOpenHelper;
 import fr.free.nrw.commons.location.LocationServiceManager;
+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.upload.UploadController;
@@ -114,31 +117,12 @@ public class CommonsApplicationModule {
         return new SessionManager(context, mediaWikiApi, sharedPreferences);
     }
 
-    @Provides
-    @Singleton
-    public MediaWikiApi provideMediaWikiApi(Context context,
-                                            @Named("default_preferences") SharedPreferences defaultPreferences,
-                                            @Named("category_prefs") SharedPreferences categoryPrefs,
-                                            Gson gson) {
-        return new ApacheHttpClientMediaWikiApi(context, BuildConfig.WIKIMEDIA_API_HOST, BuildConfig.WIKIDATA_API_HOST, defaultPreferences, categoryPrefs, gson);
-    }
-
     @Provides
     @Singleton
     public LocationServiceManager provideLocationServiceManager(Context context) {
         return new LocationServiceManager(context);
     }
 
-    /**
-     * Gson objects are very heavy. The app should ideally be using just one instance of it instead of creating new instances everywhere.
-     * @return returns a singleton Gson instance
-     */
-    @Provides
-    @Singleton
-    public Gson provideGson() {
-        return new Gson();
-    }
-
     @Provides
     @Singleton
     public DBOpenHelper provideDBOpenHelper(Context context) {
diff --git a/app/src/main/java/fr/free/nrw/commons/di/NetworkingModule.java b/app/src/main/java/fr/free/nrw/commons/di/NetworkingModule.java
index 8c0b52316..cd043e950 100644
--- a/app/src/main/java/fr/free/nrw/commons/di/NetworkingModule.java
+++ b/app/src/main/java/fr/free/nrw/commons/di/NetworkingModule.java
@@ -35,7 +35,7 @@ public class NetworkingModule {
                                             @Named("default_preferences") SharedPreferences defaultPreferences,
                                             @Named("category_prefs") SharedPreferences categoryPrefs,
                                             Gson gson) {
-        return new ApacheHttpClientMediaWikiApi(context, BuildConfig.WIKIMEDIA_API_HOST, defaultPreferences, categoryPrefs, gson);
+        return new ApacheHttpClientMediaWikiApi(context, BuildConfig.WIKIMEDIA_API_HOST, BuildConfig.WIKIDATA_API_HOST, defaultPreferences, categoryPrefs, gson);
     }
 
     @Provides
diff --git a/app/src/main/java/fr/free/nrw/commons/upload/ShareActivity.java b/app/src/main/java/fr/free/nrw/commons/upload/ShareActivity.java
index b7a5e0f42..54b9af17a 100644
--- a/app/src/main/java/fr/free/nrw/commons/upload/ShareActivity.java
+++ b/app/src/main/java/fr/free/nrw/commons/upload/ShareActivity.java
@@ -139,7 +139,6 @@ public class ShareActivity
 
     private Uri mediaUri;
     private Contribution contribution;
-    private SimpleDraweeView backgroundImageView;
     private FloatingActionButton maps_fragment;
 
     private boolean cacheFound;
@@ -163,9 +162,6 @@ public class ShareActivity
 
     private Animator CurrentAnimator;
     private long ShortAnimationDuration;
-    private FloatingActionButton zoomInButton;
-    private FloatingActionButton zoomOutButton;
-    private FloatingActionButton mainFab;
     private boolean isFABOpen = false;
 
           //Had to make them class variables, to extract out the click listeners, also I see no harm in this