Make P18 edits to corresponding wikidata entity on uploading from Nearby (#1495)

* Localisation updates from https://translatewiki.net.

* Integrate API for displaying featured images (#1456)

* Integrate API for displaying featured images

* Add pagination and refactor code so that it can be reused for category images

* Add license info to the images

* Fix author view

* Remove unused values

* Fix minor issues with featured images

* Fix null license url issue

* Remove some log lines

* Fix back navigation issue

* fix tests

* fix test inits

* Gracefully handling various error situations

* Added java docs

* Update pull_request_template.md (#1476)

* Update pull_request_template.md

* Remove Javadocs mention

* Added required/optional notes

* resolves #1464 : MediaDataExtractor is making inefficient (redundant) server calls (#1496)

* Open map of place where picture was taken (#1360)

* Intent to map added

*  Merge conflicts resolved

*  Added the functionality to hide FAB incase of null coordinate

*  Merge Conflict resolved

*  Improve pr quality

* Improve Quality

*  Added nested FAB animations

* Nested FAB implemented

*  Improve Quality

*  Added up arrow

*  Javadocs Added

* Add nearby tutorial (#1467)

* Add dependency for MaterialShowcase

* Add actionview class to get a reference to material showcase

* Create a NearbyMaterialShowcaseSequence class

* Apply sequence steps

* Add first three steps of nearby showcase

* Add sequence id constants to make sure they will be displayed only once

* Add last step of sequence to explain plus fab

* Create an object to prevent customize all sequences every time

* Fix typo

* Code cleanup

* Add strings to strings.xml

* Code cleanup

* Revert irrelevant change

* Revert irrelevant change

* Remove showcaseview for recenter button

* Use single showcaseView instead of sequence

* Add single showcase view insted of sequence to be able to edit text style

* Make sure it will be displayed only once

* Cleanup

* Update strings

* Change dismiss text style

* CONTRIBUTING: fix formatting of the gist of the guidelines (#1453)

* CONTRIBUTING: fix formatting of the gist of the guidelines

First level headings for a gist seems to be overkill.

So, replace first level headings with an ordered-list which
sounds more meaningful.

* CONTRIBUTING: specify clearly that 'blame' is a feature of "Git"

The contributing file specifies about the ability to know who wrote
something without the need of @author javadoc tags but incorrectly
attributes the feature to GitHub.

Correctly attribute the feature to where it belongs, Git, and specify
the name of the feature to help users easily take advantage of it.

* Feature/switch to butterknife (#1494)

* Implemented butterknife in MediaDetailFragment [issue #1491]

* Implemented butterknife in MediaDetailPagerFragment [[issue #1491]]

* post merge upstream master wip [[issue #1491]]

* Localisation updates from https://translatewiki.net.

* Bug fix #1504 (#1506)

* Bug fix #1504

* Filtered messages with ConnectException [issue #1504]

* A generalised message for exceptions in Nearby Activity [issue #1504]

* Localisation updates from https://translatewiki.net.

* Fix security exception crash while accessing network location provider (#1498)

* Fix security exception crash while accessing network location provider

* Added java docs

* Localisation updates from https://translatewiki.net.

* Log P18 edits to wikidata corresponding wikidata entity on uploading a nearby image

* Added java docs

* Fix test build

* Refresh nearby

* Refresh nearby list on successful edit

* Java docs

* Make authenticated wikidata edits

* Updated toast message to show entity name that was edited

Author: Vivek Maskara

app/build.gradle

@@ -130,6 +130,7 @@ android {
     productFlavors {
         prod {
             buildConfigField "String", "WIKIMEDIA_API_HOST", "\"https://commons.wikimedia.org/w/api.php\""
+            buildConfigField "String", "WIKIDATA_API_HOST", "\"https://www.wikidata.org/w/api.php\""
             buildConfigField "String", "WIKIMEDIA_FORGE_API_HOST", "\"https://tools.wmflabs.org/\""
             buildConfigField "String", "IMAGE_URL_BASE", "\"https://upload.wikimedia.org/wikipedia/commons\""
             buildConfigField "String", "HOME_URL", "\"https://commons.wikimedia.org/wiki/\""
@@ -146,6 +147,7 @@ android {
         beta {
             // What values do we need to hit the BETA versions of the site / api ?
             buildConfigField "String", "WIKIMEDIA_API_HOST", "\"https://commons.wikimedia.beta.wmflabs.org/w/api.php\""
+            buildConfigField "String", "WIKIDATA_API_HOST", "\"https://www.wikidata.org/w/api.php\""
             buildConfigField "String", "WIKIMEDIA_FORGE_API_HOST", "\"https://tools.wmflabs.org/\""
             buildConfigField "String", "IMAGE_URL_BASE", "\"https://upload.beta.wmflabs.org/wikipedia/commons\""
             buildConfigField "String", "HOME_URL", "\"https://commons.wikimedia.beta.wmflabs.org/wiki/\""

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

@@ -178,6 +178,7 @@ public static void rateApp(Context context) {
     }
 
     public static void handleWebUrl(Context context, Uri url) {
+        Timber.d("Launching web url %s", url.toString());
         Intent browserIntent = new Intent(Intent.ACTION_VIEW, url);
         if (browserIntent.resolveActivity(context.getPackageManager()) == null) {
             Toast toast = Toast.makeText(context, context.getString(R.string.no_web_browser), LENGTH_SHORT);

app/src/main/java/fr/free/nrw/commons/contributions/Contribution.java

@@ -45,6 +45,7 @@ public Contribution[] newArray(int i) {
     private long transferred;
     private String decimalCoords;
     private boolean isMultiple;
+    private String wikiDataEntityId;
 
     public Contribution(Uri contentUri, String filename, Uri localUri, String imageUrl, Date timestamp,
                         int state, long dataLength, Date dateUploaded, long transferred,
@@ -222,4 +223,17 @@ private String licenseTemplateFor(String license) {
 
         throw new RuntimeException("Unrecognized license value: " + license);
     }
+
+    public String getWikiDataEntityId() {
+        return wikiDataEntityId;
+    }
+
+    /**
+     * When the corresponding wikidata entity is known as in case of nearby uploads, it can be set
+     * using the setter method
+     * @param wikiDataEntityId
+     */
+    public void setWikiDataEntityId(String wikiDataEntityId) {
+        this.wikiDataEntityId = wikiDataEntityId;
+    }
 }

app/src/main/java/fr/free/nrw/commons/contributions/ContributionController.java

@@ -90,7 +90,7 @@ public void startGalleryPick() {
         fragment.startActivityForResult(pickImageIntent, SELECT_FROM_GALLERY);
     }
 
-    public void handleImagePicked(int requestCode, Intent data, boolean isDirectUpload) {
+    public void handleImagePicked(int requestCode, Intent data, boolean isDirectUpload, String wikiDataEntityId) {
         FragmentActivity activity = fragment.getActivity();
         Timber.d("handleImagePicked() called with onActivityResult()");
         Intent shareIntent = new Intent(activity, ShareActivity.class);
@@ -102,9 +102,6 @@ public void handleImagePicked(int requestCode, Intent data, boolean isDirectUplo
                 shareIntent.setType(activity.getContentResolver().getType(imageData));
                 shareIntent.putExtra(EXTRA_STREAM, imageData);
                 shareIntent.putExtra(EXTRA_SOURCE, SOURCE_GALLERY);
-                if (isDirectUpload) {
-                    shareIntent.putExtra("isDirectUpload", true);
-                }
                 break;
             case SELECT_FROM_CAMERA:
                 //FIXME: Find out appropriate mime type
@@ -113,16 +110,17 @@ public void handleImagePicked(int requestCode, Intent data, boolean isDirectUplo
                 shareIntent.setType("image/jpeg");
                 shareIntent.putExtra(EXTRA_STREAM, lastGeneratedCaptureUri);
                 shareIntent.putExtra(EXTRA_SOURCE, SOURCE_CAMERA);
-                if (isDirectUpload) {
-                    shareIntent.putExtra("isDirectUpload", true);
-                }
 
                 break;
             default:
                 break;
         }
         Timber.i("Image selected");
         try {
+            shareIntent.putExtra("isDirectUpload", isDirectUpload);
+            if (wikiDataEntityId != null && !wikiDataEntityId.equals("")) {
+                shareIntent.putExtra("wikiDataEntityId", wikiDataEntityId);
+            }
             activity.startActivity(shareIntent);
         } catch (SecurityException e) {
             Timber.e(e, "Security Exception");

app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java

@@ -117,7 +117,7 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) {
         if (resultCode == RESULT_OK) {
             Timber.d("OnActivityResult() parameters: Req code: %d Result code: %d Data: %s",
                     requestCode, resultCode, data);
-            controller.handleImagePicked(requestCode, data, false);
+            controller.handleImagePicked(requestCode, data, false, null);
         } else {
             Timber.e("OnActivityResult() parameters: Req code: %d Result code: %d Data: %s",
                     requestCode, resultCode, data);

app/src/main/java/fr/free/nrw/commons/di/CommonsApplicationModule.java

@@ -24,6 +24,8 @@
 import fr.free.nrw.commons.mwapi.MediaWikiApi;
 import fr.free.nrw.commons.nearby.NearbyPlaces;
 import fr.free.nrw.commons.upload.UploadController;
+import fr.free.nrw.commons.wikidata.WikidataEditListener;
+import fr.free.nrw.commons.wikidata.WikidataEditListenerImpl;
 
 import static android.content.Context.MODE_PRIVATE;
 import static fr.free.nrw.commons.contributions.ContributionsContentProvider.CONTRIBUTION_AUTHORITY;
@@ -123,7 +125,7 @@ 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, defaultPreferences, categoryPrefs, gson);
+        return new ApacheHttpClientMediaWikiApi(context, BuildConfig.WIKIMEDIA_API_HOST, BuildConfig.WIKIDATA_API_HOST, defaultPreferences, categoryPrefs, gson);
     }
 
     @Provides
@@ -165,4 +167,10 @@ public NearbyPlaces provideNearbyPlaces() {
     public LruCache<String, String> provideLruCache() {
         return new LruCache<>(1024);
     }
+
+    @Provides
+    @Singleton
+    public WikidataEditListener provideWikidataEditListener() {
+        return new WikidataEditListenerImpl();
+    }
 }

app/src/main/java/fr/free/nrw/commons/location/LocationServiceManager.java

@@ -284,6 +284,7 @@ public enum LocationChangeType{
         LOCATION_SIGNIFICANTLY_CHANGED, //Went out of borders of nearby markers
         LOCATION_SLIGHTLY_CHANGED,      //User might be walking or driving
         LOCATION_NOT_CHANGED,
-        PERMISSION_JUST_GRANTED
+        PERMISSION_JUST_GRANTED,
+        MAP_UPDATED
     }
 }

app/src/main/java/fr/free/nrw/commons/mwapi/ApacheHttpClientMediaWikiApi.java

@@ -25,6 +25,8 @@
 import org.apache.http.util.EntityUtils;
 import org.mediawiki.api.ApiResult;
 import org.mediawiki.api.MWApi;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 
 import java.io.IOException;
@@ -62,13 +64,15 @@ public class ApacheHttpClientMediaWikiApi implements MediaWikiApi {
     private static final String THUMB_SIZE = "640";
     private AbstractHttpClient httpClient;
     private MWApi api;
+    private MWApi wikidataApi;
     private Context context;
     private SharedPreferences defaultPreferences;
     private SharedPreferences categoryPreferences;
     private Gson gson;
 
     public ApacheHttpClientMediaWikiApi(Context context,
                                         String apiURL,
+                                        String wikidatApiURL,
                                         SharedPreferences defaultPreferences,
                                         SharedPreferences categoryPreferences,
                                         Gson gson) {
@@ -82,6 +86,7 @@ public ApacheHttpClientMediaWikiApi(Context context,
         params.setParameter(CoreProtocolPNames.USER_AGENT, getUserAgent());
         httpClient = new DefaultHttpClient(cm, params);
         api = new MWApi(apiURL, httpClient);
+        wikidataApi = new MWApi(wikidatApiURL, httpClient);
         this.defaultPreferences = defaultPreferences;
         this.categoryPreferences = categoryPreferences;
         this.gson = gson;
@@ -206,6 +211,15 @@ public String getEditToken() throws IOException {
         return api.getEditToken();
     }
 
+    @Override
+    public String getCentralAuthToken() throws IOException {
+        String centralAuthToken = api.action("centralauthtoken")
+                .get()
+                .getString("/api/centralauthtoken/@centralauthtoken");
+        Timber.d("MediaWiki Central auth token is %s", centralAuthToken);
+        return centralAuthToken;
+    }
+
     @Override
     public boolean fileExistsWithName(String fileName) throws IOException {
         return api.action("query")
@@ -351,6 +365,65 @@ public Observable<String> allCategories(String filterValue, int searchCatsLimit)
         }).flatMapObservable(Observable::fromIterable);
     }
 
+    /**
+     * Get the edit token for making wiki data edits
+     * https://www.mediawiki.org/wiki/API:Tokens
+     * @return
+     * @throws IOException
+     */
+    private String getWikidataEditToken() throws IOException {
+        return wikidataApi.getEditToken();
+    }
+
+    @Override
+    public String getWikidataCsrfToken() throws IOException {
+        String wikidataCsrfToken = wikidataApi.action("query")
+                .param("action", "query")
+                .param("centralauthtoken", getCentralAuthToken())
+                .param("meta", "tokens")
+                .post()
+                .getString("/api/query/tokens/@csrftoken");
+        Timber.d("Wikidata csrf token is %s", wikidataCsrfToken);
+        return wikidataCsrfToken;
+    }
+
+    /**
+     * Creates a new claim using the wikidata API
+     * https://www.mediawiki.org/wiki/Wikibase/API
+     * @param entityId the wikidata entity to be edited
+     * @param property the property to be edited, for eg P18 for images
+     * @param snaktype the type of value stored for that property
+     * @param value the actual value to be stored for the property, for eg filename in case of P18
+     * @return returns true if the claim is successfully created
+     * @throws IOException
+     */
+    @Nullable
+    @Override
+    public boolean wikidatCreateClaim(String entityId, String property, String snaktype, String value) throws IOException {
+        ApiResult result = wikidataApi.action("wbcreateclaim")
+                .param("entity", entityId)
+                .param("centralauthtoken", getCentralAuthToken())
+                .param("token", getWikidataCsrfToken())
+                .param("snaktype", snaktype)
+                .param("property", property)
+                .param("value", value)
+                .post();
+
+        if (result == null || result.getNode("api") == null) {
+            return false;
+        }
+
+        Node node = result.getNode("api").getDocument();
+        Element element = (Element) node;
+
+        if (element != null && element.getAttribute("success").equals("1")) {
+            return true;
+        } else {
+            Timber.e(result.getString("api/error/@code") + " " + result.getString("api/error/@info"));
+        }
+        return false;
+    }
+
     @Override
     @NonNull
     public Observable<String> searchTitles(String title, int searchCatsLimit) {
@@ -586,6 +659,7 @@ public UploadResult uploadFile(String filename,
         String resultStatus = result.getString("/api/upload/@result");
         if (!resultStatus.equals("Success")) {
             String errorCode = result.getString("/api/error/@code");
+            Timber.e(errorCode);
             return new UploadResult(resultStatus, errorCode);
         } else {
             Date dateUploaded = parseMWDate(result.getString("/api/upload/imageinfo/@timestamp"));

app/src/main/java/fr/free/nrw/commons/mwapi/MediaWikiApi.java

@@ -27,6 +27,10 @@ public interface MediaWikiApi {
 
     String getEditToken() throws IOException;
 
+    String getWikidataCsrfToken() throws IOException;
+
+    String getCentralAuthToken() throws IOException;
+
     boolean fileExistsWithName(String fileName) throws IOException;
 
     boolean pageExists(String pageName) throws IOException;
@@ -49,6 +53,9 @@ public interface MediaWikiApi {
     @Nullable
     String appendEdit(String editToken, String processedPageContent, String filename, String summary) throws IOException;
 
+    @Nullable
+    boolean wikidatCreateClaim(String entityId, String property, String snaktype, String value) throws IOException;
+
     @NonNull
     MediaResult fetchMediaByFilename(String filename) throws IOException;