mirrors/oeffi
1
0
Fork 0
mirror of https://gitlab.com/oeffi/oeffi.git synced 2025-07-07 06:08:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

NetworkResources: Fix crash when label or comment doesn't exist.

Browse source
This commit is contained in:
Andreas Schildbach 2018-12-07 02:09:50 +01:00
parent 387322250e
commit 08c7507e78
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
oeffi/src/de/schildbach/oeffi/network/NetworkResources.java
View file

@ -30,16 +30,16 @@ public class NetworkResources {
public final @Nullable Drawable icon;
public final boolean isLogo;
public final String label;
public final String comment;
public final @Nullable String comment;
public final @Nullable String license;
public final boolean cooperation;
private NetworkResources(final @Nullable Drawable icon, final boolean isLogo, final String label,
final String comment, final @Nullable String license, final boolean cooperation) {
final @Nullable String comment, final @Nullable String license, final boolean cooperation) {
this.icon = icon;
this.isLogo = isLogo;
this.label = checkNotNull(label);
this.comment = checkNotNull(comment);
this.comment = comment;
this.license = license;
this.cooperation = cooperation;
}
@ -64,9 +64,9 @@ public class NetworkResources {
isLogo = false;
}
final int labelId = res.getIdentifier(prefix + "_label", "string", packageName);
final String label = res.getString(labelId);
final String label = labelId != 0 ? res.getString(labelId) : networkId;
final int commentId = res.getIdentifier(prefix + "_comment", "string", packageName);
final String comment = res.getString(commentId);
final String comment = commentId != 0 ? res.getString(commentId) : null;
final int licenseId = res.getIdentifier(prefix + "_license", "string", packageName);
final String license = licenseId != 0 ? res.getString(licenseId) : null;
final boolean cooperation = isLogo;