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

Update LicenseList.java

Browse source 
Fix crash upon opening unknown license
This commit is contained in:
Adam Jones 2016-05-31 19:42:02 +01:00
parent 49712ec1b2
commit 02c82a90c2
1 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

11
commons/src/main/java/fr/free/nrw/commons/LicenseList.java
View file

@ -53,7 +53,7 @@ public class LicenseList {
}
public String nameIdForTemplate(String template) {
// hack :D
// hack :D (converts dashes and periods to underscores)
// cc-by-sa-3.0 -> cc_by_sa_3_0
return "license_name_" + template.toLowerCase().replace("-", "_").replace(".", "_");
}
@ -68,8 +68,11 @@ public class LicenseList {
Log.d("Commons", "LicenseList.nameForTemplate: stringId: " + stringId);
int nameId = stringIdByName(stringId);
Log.d("Commons", "LicenseList.nameForTemplate: nameId: " + nameId);
String name = res.getString(nameId);
Log.d("Commons", "LicenseList.nameForTemplate: name: " + name);
return name;
if(nameId != 0) {
String name = res.getString(nameId);
Log.d("Commons", "LicenseList.nameForTemplate: name: " + name);
return name;
}
return template;
}
}