mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-10-26 12:23:58 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Cherry-Picked NPE fix from master (#4569)

Browse source
This commit is contained in:
Ashish 2021-08-23 14:39:52 +05:30 • committed by GitHub
parent 6588a6fd0e
commit bb3f8f3801
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

14
app/src/main/java/fr/free/nrw/commons/upload/PageContentsCreator.java
View file

@ -26,24 +26,28 @@ class PageContentsCreator {
private final Context context;
@Inject
public PageContentsCreator(Context context) {
public PageContentsCreator(final Context context) {
this.context = context;
}
public String createFrom(Contribution contribution, String countryCode) {
public String createFrom(final Contribution contribution, final String countryCode) {
StringBuilder buffer = new StringBuilder();
final Media media = contribution.getMedia();
buffer
.append("== {{int:filedesc}} ==\n")
.append("{{Information\n")
.append("|description=").append(media.getFallbackDescription())
.append("{{ on Wikidata|").append(contribution.getWikidataPlace().getId()).append("}}")
.append("|description=").append(media.getFallbackDescription()).append("\n");
if (contribution.getWikidataPlace() != null) {
buffer.append("{{ on Wikidata|").append(contribution.getWikidataPlace().getId())
.append("}}");
}
buffer
.append("\n")
.append("|source=").append("{{own}}\n")
.append("|author=[[User:").append(media.getAuthor()).append("|")
.append(media.getAuthor()).append("]]\n");
String templatizedCreatedDate = getTemplatizedCreatedDate(
final String templatizedCreatedDate = getTemplatizedCreatedDate(
contribution.getDateCreated(), contribution.getDateCreatedSource());
if (!StringUtils.isBlank(templatizedCreatedDate)) {
buffer.append("|date=").append(templatizedCreatedDate);

2
app/src/main/java/fr/free/nrw/commons/upload/worker/UploadWorker.kt
View file

@ -279,7 +279,7 @@ class UploadWorker(var appContext: Context, workerParams: WorkerParameters) :
//Upload the file from stash
var countryCode: String? =null
with(contribution.wikidataPlace?.location){
if(contribution.wikidataPlace?.isMonumentUpload!!) {
if (contribution.wikidataPlace?.isMonumentUpload == true) {
countryCode =
reverseGeoCode(contribution.wikidataPlace?.location!!)?.toLowerCase()
}