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

Fix searching in Explore screen. (#2708)

Browse source 
* Fix searching in Explore screen.

* Fix spurious checkstyle issue.
This commit is contained in:
Dmitry Brant 2019-03-22 12:35:04 -04:00 • committed by Vivek Maskara
parent c17a1f90ad
commit 671e305225
2 changed files with 30 additions and 113 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/src/main/java/fr/free/nrw/commons/Media.java
View file

@ -460,12 +460,12 @@ public class Media implements Parcelable {
page.title(), page.title(),
imageInfo.getMetadata().imageDescription().value(), imageInfo.getMetadata().imageDescription().value(),
0, 0,
DateUtils.getDateFromString(imageInfo.getMetadata().getDateTimeOriginal().value()), DateUtils.getDateFromString(imageInfo.getMetadata().dateTimeOriginal().value()),
DateUtils.getDateFromString(imageInfo.getMetadata().getDateTime().value()), DateUtils.getDateFromString(imageInfo.getMetadata().dateTime().value()),
StringUtils.getParsedStringFromHtml(imageInfo.getMetadata().getArtist().value()) StringUtils.getParsedStringFromHtml(imageInfo.getMetadata().artist().value())
); );
media.setLicense(imageInfo.getMetadata().getLicenseShortName().value()); media.setLicense(imageInfo.getMetadata().licenseShortName().value());
return media; return media;
} }

133
app/src/main/java/fr/free/nrw/commons/media/model/ExtMetadata.java
View file

@ -1,9 +1,10 @@
package fr.free.nrw.commons.media.model; package fr.free.nrw.commons.media.model;
import com.google.gson.annotations.SerializedName;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import fr.free.nrw.commons.utils.StringUtils;
import com.google.gson.annotations.SerializedName;
public class ExtMetadata { public class ExtMetadata {
@SuppressWarnings("unused") @SerializedName("DateTime") @Nullable @SuppressWarnings("unused") @SerializedName("DateTime") @Nullable
@ -26,136 +27,52 @@ public class ExtMetadata {
@SuppressWarnings("unused") @SerializedName("Restrictions") @Nullable private Values restrictions; @SuppressWarnings("unused") @SerializedName("Restrictions") @Nullable private Values restrictions;
@SuppressWarnings("unused") @SerializedName("License") @Nullable private Values license; @SuppressWarnings("unused") @SerializedName("License") @Nullable private Values license;
@Nullable public Values licenseShortName() { @NonNull public Values dateTime() {
return licenseShortName; return dateTime != null ? dateTime : new Values();
} }
@Nullable public Values licenseUrl() { @NonNull public Values dateTimeOriginal() {
return licenseUrl; return dateTimeOriginal != null ? dateTimeOriginal : new Values();
} }
@Nullable public Values license() { @NonNull public Values licenseShortName() {
return license; return licenseShortName != null ? licenseShortName : new Values();
} }
@Nullable public Values imageDescription() { @NonNull public Values licenseUrl() {
return imageDescription; return licenseUrl != null ? licenseUrl : new Values();
} }
@Nullable @NonNull public Values license() {
public Values getDateTime() { return license != null ? license : new Values();
return dateTime;
} }
@Nullable @NonNull public Values imageDescription() {
public Values getObjectName() { return imageDescription != null ? imageDescription : new Values();
return objectName;
} }
@Nullable @NonNull public Values objectName() {
public Values getCommonsMetadataExtension() { return objectName != null ? objectName : new Values();
return commonsMetadataExtension;
} }
@Nullable @NonNull public Values usageTerms() {
public Values getCategories() { return usageTerms != null ? usageTerms : new Values();
return categories;
} }
@Nullable @NonNull public Values artist() {
public Values getAssessments() { return artist != null ? artist : new Values();
return assessments;
}
@Nullable
public Values getImageDescription() {
return imageDescription;
}
@Nullable
public Values getDateTimeOriginal() {
return dateTimeOriginal;
}
@Nullable
public Values getArtist() {
return artist;
}
@Nullable
public Values getCredit() {
return credit;
}
@Nullable
public Values getPermission() {
return permission;
}
@Nullable
public Values getAuthorCount() {
return authorCount;
}
@Nullable
public Values getLicenseShortName() {
return licenseShortName;
}
@Nullable
public Values getUsageTerms() {
return usageTerms;
}
@Nullable
public Values getLicenseUrl() {
return licenseUrl;
}
@Nullable
public Values getAttributionRequired() {
return attributionRequired;
}
@Nullable
public Values getCopyrighted() {
return copyrighted;
}
@Nullable
public Values getRestrictions() {
return restrictions;
}
@Nullable
public Values getLicense() {
return license;
}
@Nullable public Values objectName() {
return objectName;
}
@Nullable public Values usageTerms() {
return usageTerms;
}
@Nullable public Values artist() {
return artist;
} }
public class Values { public class Values {
@SuppressWarnings("unused,NullableProblems") @NonNull @SuppressWarnings("unused,NullableProblems") @Nullable private String value;
private String value; @SuppressWarnings("unused,NullableProblems") @Nullable private String source;
@SuppressWarnings("unused,NullableProblems") @NonNull private String source;
@SuppressWarnings("unused,NullableProblems") @NonNull private String hidden;
@NonNull public String value() { @NonNull public String value() {
return value; return StringUtils.defaultString(value);
} }
@NonNull public String source() { @NonNull public String source() {
return source; return StringUtils.defaultString(source);
} }
} }
} }