Merge branch 'master' into structured-data

This commit is contained in:
Sean Mac Gillicuddy 2020-03-25 10:13:06 +00:00
commit 587d97716a

View file

@ -83,7 +83,7 @@ public class WikidataEditService {
* @param p18Value pic attribute of Wikidata item * @param p18Value pic attribute of Wikidata item
>>>>>>> origin/master >>>>>>> origin/master
*/ */
public void createClaimWithLogging(String wikidataEntityId, String wikiItemName, String fileName, @NonNull String p18Value) { public void createClaimWithLogging(String wikidataEntityId, String wikiItemName, String fileName, String p18Value) {
if (wikidataEntityId == null) { if (wikidataEntityId == null) {
Timber.d("Skipping creation of claim as Wikidata entity ID is null"); Timber.d("Skipping creation of claim as Wikidata entity ID is null");
return; return;
@ -99,7 +99,7 @@ public class WikidataEditService {
return; return;
} }
if (!p18Value.trim().isEmpty()) { if (p18Value != null && !p18Value.trim().isEmpty()) {
Timber.d("Skipping creation of claim as p18Value is not empty, we won't override existing image"); Timber.d("Skipping creation of claim as p18Value is not empty, we won't override existing image");
return; return;
} }