commons-app · ashishkumar468 · Nov 23, 2019 · Oct 12, 2019
diff --git a/app/build.gradle b/app/build.gradle
@@ -222,7 +222,7 @@ android {
             buildConfigField "String", "IMAGE_URL_BASE", "\"https://upload.beta.wmflabs.org/wikipedia/commons\""
             buildConfigField "String", "HOME_URL", "\"https://commons.wikimedia.beta.wmflabs.org/wiki/\""
             buildConfigField "String", "COMMONS_URL", "\"https://commons.wikimedia.beta.wmflabs.org\""
-            buildConfigField "String", "WIKIDATA_URL", "\"https://wikidata.org\""
+            buildConfigField "String", "WIKIDATA_URL", "\"https:/www./wikidata.org\""
             buildConfigField "String", "MOBILE_HOME_URL", "\"https://commons.m.wikimedia.beta.wmflabs.org/wiki/\""
             buildConfigField "String", "SIGNUP_LANDING_URL", "\"https://commons.m.wikimedia.beta.wmflabs.org/w/index.php?title=Special:CreateAccount&returnto=Main+Page&returntoquery=welcome%3Dyes\""
             buildConfigField "String", "SIGNUP_SUCCESS_REDIRECTION_URL", "\"https://commons.m.wikimedia.beta.wmflabs.org/w/index.php?title=Main_Page&welcome=yes\""

diff --git a/app/src/main/java/fr/free/nrw/commons/CommonsApplication.java b/app/src/main/java/fr/free/nrw/commons/CommonsApplication.java
@@ -1,12 +1,5 @@
 package fr.free.nrw.commons;
 
-import static org.acra.ReportField.ANDROID_VERSION;
-import static org.acra.ReportField.APP_VERSION_CODE;
-import static org.acra.ReportField.APP_VERSION_NAME;
-import static org.acra.ReportField.PHONE_MODEL;
-import static org.acra.ReportField.STACK_TRACE;
-import static org.acra.ReportField.USER_COMMENT;
-
 import android.annotation.SuppressLint;
 import android.app.Application;
 import android.app.NotificationChannel;
@@ -16,12 +9,28 @@
 import android.os.Build;
 import android.os.Process;
 import android.util.Log;
+
 import androidx.annotation.NonNull;
+
 import com.facebook.drawee.backends.pipeline.Fresco;
 import com.facebook.imagepipeline.core.ImagePipeline;
 import com.facebook.imagepipeline.core.ImagePipelineConfig;
 import com.squareup.leakcanary.LeakCanary;
 import com.squareup.leakcanary.RefWatcher;
+
+import org.acra.ACRA;
+import org.acra.annotation.AcraCore;
+import org.acra.annotation.AcraDialog;
+import org.acra.annotation.AcraMailSender;
+import org.acra.data.StringFormat;
+import org.wikipedia.AppAdapter;
+import org.wikipedia.language.AppLanguageLookUpTable;
+
+import java.io.File;
+
+import javax.inject.Inject;
+import javax.inject.Named;
+
 import fr.free.nrw.commons.auth.SessionManager;
 import fr.free.nrw.commons.bookmarks.locations.BookmarkLocationsDao;
 import fr.free.nrw.commons.bookmarks.pictures.BookmarkPicturesDao;
@@ -40,18 +49,15 @@
 import io.reactivex.internal.functions.Functions;
 import io.reactivex.plugins.RxJavaPlugins;
 import io.reactivex.schedulers.Schedulers;
-import java.io.File;
-import javax.inject.Inject;
-import javax.inject.Named;
-import org.acra.ACRA;
-import org.acra.annotation.AcraCore;
-import org.acra.annotation.AcraDialog;
-import org.acra.annotation.AcraMailSender;
-import org.acra.data.StringFormat;
-import org.wikipedia.AppAdapter;
-import org.wikipedia.language.AppLanguageLookUpTable;
 import timber.log.Timber;
 
+import static org.acra.ReportField.ANDROID_VERSION;
+import static org.acra.ReportField.APP_VERSION_CODE;
+import static org.acra.ReportField.APP_VERSION_NAME;
+import static org.acra.ReportField.PHONE_MODEL;
+import static org.acra.ReportField.STACK_TRACE;
+import static org.acra.ReportField.USER_COMMENT;
+
 @AcraCore(
         buildConfigClass = BuildConfig.class,
         resReportSendSuccessToast = R.string.crash_dialog_ok_toast,
@@ -114,6 +120,7 @@ public AppLanguageLookUpTable getLanguageLookUpTable() {
     @Override
     public void onCreate() {
         super.onCreate();
+
         INSTANCE = this;
         ACRA.init(this);
 

diff --git a/app/src/main/java/fr/free/nrw/commons/OkHttpConnectionFactory.java b/app/src/main/java/fr/free/nrw/commons/OkHttpConnectionFactory.java
@@ -1,12 +1,13 @@
 package fr.free.nrw.commons;
 
+import androidx.annotation.NonNull;
+
 import org.wikipedia.dataclient.SharedPreferenceCookieManager;
 import org.wikipedia.dataclient.okhttp.HttpStatusException;
 
 import java.io.File;
 import java.io.IOException;
 
-import androidx.annotation.NonNull;
 import okhttp3.Cache;
 import okhttp3.Interceptor;
 import okhttp3.OkHttpClient;

diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java
@@ -29,7 +29,6 @@
 import fr.free.nrw.commons.contributions.ContributionsListAdapter.Callback;
 import fr.free.nrw.commons.di.CommonsDaggerSupportFragment;
 import fr.free.nrw.commons.kvstore.JsonKvStore;
-import fr.free.nrw.commons.wikidata.WikidataClient;
 
 import static android.view.View.GONE;
 import static android.view.View.VISIBLE;
@@ -58,8 +57,6 @@ public class ContributionsListFragment extends CommonsDaggerSupportFragment {
 
     @Inject @Named("default_preferences") JsonKvStore kvStore;
     @Inject ContributionController controller;
-    @Inject
-    WikidataClient wikidataClient;
 
     private Animation fab_close;
     private Animation fab_open;

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
@@ -31,6 +31,7 @@
 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.wikidata.WikidataInterface;
 import okhttp3.Cache;
 import okhttp3.HttpUrl;
 import okhttp3.OkHttpClient;
@@ -51,7 +52,6 @@ public class NetworkingModule {
     private static final String NAMED_WIKI_DATA_WIKI_SITE = "wikidata-wikisite";
 
     public static final String NAMED_COMMONS_CSRF = "commons-csrf";
-    public static final String NAMED_WIKI_DATA_CSRF = "wikidata-csrf";
 
     @Provides
     @Singleton
@@ -97,14 +97,6 @@ public CsrfTokenClient provideCommonsCsrfTokenClient(@Named(NAMED_COMMONS_WIKI_S
         return new CsrfTokenClient(commonsWikiSite, commonsWikiSite);
     }
 
-    @Named(NAMED_WIKI_DATA_CSRF)
-    @Provides
-    @Singleton
-    public CsrfTokenClient provideWikidataCsrfTokenClient(@Named(NAMED_COMMONS_WIKI_SITE) WikiSite commonsWikiSite,
-                                                          @Named(NAMED_WIKI_DATA_WIKI_SITE) WikiSite wikidataWikiSite) {
-        return new CsrfTokenClient(wikidataWikiSite, commonsWikiSite);
-    }
-
     @Provides
     @Singleton
     public LoginClient provideLoginClient() {
@@ -200,15 +192,6 @@ public PageEditClient provideCommonsPageEditClient(@Named(NAMED_COMMONS_CSRF) Cs
         return new PageEditClient(csrfTokenClient, pageEditInterface, service);
     }
 
-    @Named("wikidata-page-edit")
-    @Provides
-    @Singleton
-    public PageEditClient provideWikidataPageEditClient(@Named(NAMED_WIKI_DATA_CSRF) CsrfTokenClient csrfTokenClient,
-                                                        @Named("wikidata-page-edit-service") PageEditInterface pageEditInterface,
-                                                        @Named("wikidata-service") Service service) {
-        return new PageEditClient(csrfTokenClient, pageEditInterface, service);
-    }
-
     @Provides
     @Singleton
     public MediaInterface provideMediaInterface(@Named(NAMED_COMMONS_WIKI_SITE) WikiSite commonsWikiSite) {
@@ -226,4 +209,10 @@ public CategoryInterface provideCategoryInterface(@Named(NAMED_COMMONS_WIKI_SITE
     public UserInterface provideUserInterface(@Named(NAMED_COMMONS_WIKI_SITE) WikiSite commonsWikiSite) {
         return ServiceFactory.get(commonsWikiSite, BuildConfig.COMMONS_URL, UserInterface.class);
     }
+
+    @Provides
+    @Singleton
+    public WikidataInterface provideWikidataInterface(@Named(NAMED_WIKI_DATA_WIKI_SITE) WikiSite wikiDataWikiSite) {
+        return ServiceFactory.get(wikiDataWikiSite, BuildConfig.WIKIDATA_URL, WikidataInterface.class);
+    }
 }
diff --git a/app/src/main/java/fr/free/nrw/commons/upload/UploadModel.java b/app/src/main/java/fr/free/nrw/commons/upload/UploadModel.java
@@ -3,7 +3,20 @@
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.net.Uri;
+
 import androidx.annotation.Nullable;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+
+import javax.inject.Inject;
+import javax.inject.Named;
+import javax.inject.Singleton;
+
 import fr.free.nrw.commons.CommonsApplication;
 import fr.free.nrw.commons.Utils;
 import fr.free.nrw.commons.auth.SessionManager;
@@ -18,15 +31,6 @@
 import io.reactivex.Single;
 import io.reactivex.disposables.CompositeDisposable;
 import io.reactivex.subjects.BehaviorSubject;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Singleton;
 import timber.log.Timber;
 
 @Singleton

diff --git a/app/src/main/java/fr/free/nrw/commons/upload/UploadService.java b/app/src/main/java/fr/free/nrw/commons/upload/UploadService.java
@@ -87,7 +87,6 @@ protected class NotificationUpdateProgressListener{
         }
 
         public void onProgress(long transferred, long total) {
-            Timber.d("Uploaded %d of %d", transferred, total);
             if (!notificationTitleChanged) {
                 curNotification.setContentTitle(notificationProgressTitle);
                 notificationTitleChanged = true;

diff --git a/app/src/main/java/fr/free/nrw/commons/wikidata/WikidataClient.java b/app/src/main/java/fr/free/nrw/commons/wikidata/WikidataClient.java
@@ -1,40 +1,70 @@
 package fr.free.nrw.commons.wikidata;
 
-import org.wikipedia.csrf.CsrfTokenClient;
-import org.wikipedia.dataclient.Service;
+import org.jetbrains.annotations.NotNull;
 
 import javax.inject.Inject;
-import javax.inject.Named;
 import javax.inject.Singleton;
 
+import fr.free.nrw.commons.wikidata.model.AddEditTagResponse;
 import io.reactivex.Observable;
-
-import static fr.free.nrw.commons.di.NetworkingModule.NAMED_WIKI_DATA_CSRF;
+import io.reactivex.ObservableSource;
+import okhttp3.MediaType;
+import okhttp3.RequestBody;
 
 @Singleton
 public class WikidataClient {
 
-    private final Service service;
-    private final CsrfTokenClient csrfTokenClient;
+
+    private final WikidataInterface wikidataInterface;
 
     @Inject
-    public WikidataClient(@Named("wikidata-service") Service service,
-                          @Named(NAMED_WIKI_DATA_CSRF) CsrfTokenClient csrfTokenClient) {
-        this.service = service;
-        this.csrfTokenClient = csrfTokenClient;
+    public WikidataClient(WikidataInterface wikidataInterface) {
+        this.wikidataInterface = wikidataInterface;
+    }
+
+    /**
+     * Create wikidata claim to add P18 value
+     * @param entityId wikidata entity ID
+     * @param value value of the P18 edit
+     * @return revisionID of the edit
+     */
+    Observable<Long> createClaim(String entityId, String value) {
+        return getCsrfToken()
+                .flatMap(csrfToken -> wikidataInterface.postCreateClaim(toRequestBody(entityId),
+                        toRequestBody("value"),
+                        toRequestBody("P18"),
+                        toRequestBody(value),
+                        toRequestBody("en"),
+                        toRequestBody(csrfToken)))
+                .map(mwPostResponse -> mwPostResponse.getPageinfo().getLastrevid());
+    }
+
+    /**
+     * Converts string value to RequestBody for multipart request
+     */
+    private RequestBody toRequestBody(String value) {
+        return RequestBody.create(MediaType.parse("text/plain"), value);
+    }
+
+    /**
+     * Get csrf token for wikidata edit
+     */
+    @NotNull
+    private Observable<String> getCsrfToken() {
+        return wikidataInterface.getCsrfToken().map(mwQueryResponse -> mwQueryResponse.query().csrfToken());
     }
 
-    public Observable<Long> createClaim(String entityId, String property, String snaktype, String value) {
-        try {
-            return service.postCreateClaim(entityId, snaktype, property, value, "en", csrfTokenClient.getTokenBlocking())
-                    .map(mwPostResponse -> {
-                        if (mwPostResponse.getSuccessVal() == 1) {
-                            return 1L;
-                        }
-                        return -1L;
-                    });
-        } catch (Throwable throwable) {
-            return Observable.just(-1L);
-        }
+    /**
+     * Add edit tag for a given revision ID. The app currently uses this to tag P18 edits
+     * @param revisionId revision ID of the page edited
+     * @param tag to be added
+     * @param reason to be mentioned
+     */
+    ObservableSource<AddEditTagResponse> addEditTag(Long revisionId, String tag, String reason) {
+        return getCsrfToken()
+                .flatMap(csrfToken -> wikidataInterface.addEditTag(String.valueOf(revisionId),
+                        tag,
+                        reason,
+                        csrfToken));
     }
 }
diff --git a/app/src/main/java/fr/free/nrw/commons/wikidata/WikidataEditService.java b/app/src/main/java/fr/free/nrw/commons/wikidata/WikidataEditService.java
@@ -10,7 +10,6 @@
 import javax.inject.Singleton;
 
 import fr.free.nrw.commons.R;
-import fr.free.nrw.commons.actions.PageEditClient;
 import fr.free.nrw.commons.kvstore.JsonKvStore;
 import fr.free.nrw.commons.utils.ViewUtil;
 import io.reactivex.android.schedulers.AndroidSchedulers;
@@ -32,19 +31,16 @@ public class WikidataEditService {
     private final WikidataEditListener wikidataEditListener;
     private final JsonKvStore directKvStore;
     private final WikidataClient wikidataClient;
-    private final PageEditClient wikiDataPageEditClient;
 
     @Inject
-    public WikidataEditService(Context context,
-                               WikidataEditListener wikidataEditListener,
-                               @Named("default_preferences") JsonKvStore directKvStore,
-                               WikidataClient wikidataClient,
-                               @Named("wikidata-page-edit") PageEditClient wikiDataPageEditClient) {
+    WikidataEditService(Context context,
+                        WikidataEditListener wikidataEditListener,
+                        @Named("default_preferences") JsonKvStore directKvStore,
+                        WikidataClient wikidataClient) {
         this.context = context;
         this.wikidataEditListener = wikidataEditListener;
         this.directKvStore = directKvStore;
         this.wikidataClient = wikidataClient;
-        this.wikiDataPageEditClient = wikiDataPageEditClient;
     }
 
     /**
@@ -85,11 +81,11 @@ private void editWikidataProperty(String wikidataEntityId, String fileName) {
 
         String propertyValue = getFileName(fileName);
 
-        Timber.d(propertyValue);
-        wikidataClient.createClaim(wikidataEntityId, "P18", "value", propertyValue)
+        Timber.d("Entity id is %s and property value is %s", wikidataEntityId, propertyValue);
+        wikidataClient.createClaim(wikidataEntityId, propertyValue)
                 .flatMap(revisionId -> {
                     if (revisionId != -1) {
-                        return wikiDataPageEditClient.addEditTag(revisionId, COMMONS_APP_TAG, COMMONS_APP_EDIT_REASON);
+                        return wikidataClient.addEditTag(revisionId, COMMONS_APP_TAG, COMMONS_APP_EDIT_REASON);
                     }
                     throw new RuntimeException("Unable to edit wikidata item");
                 })