Karl/BobStore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'spdx-4.0' into 'master'

Browse Source 
AppDetails: don't mangle spdx link.

Closes #1472

See merge request fdroid/fdroidclient!684
This commit is contained in:
Hans-Christoph Steiner 2018-05-29 09:20:57 +00:00
commit ae7973f5c4
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/org/fdroid/fdroid/views/AppDetailsRecyclerViewAdapter.java
View File

@ -837,9 +837,6 @@ public class AppDetailsRecyclerViewAdapter
// License link // License link
if (!TextUtils.isEmpty(app.license)) { if (!TextUtils.isEmpty(app.license)) {
String firstLicense = app.license.split(",")[0]; String firstLicense = app.license.split(",")[0];
if (firstLicense.endsWith("+")) { // the + is SPDX syntax on top of the license name
firstLicense = firstLicense.substring(0, firstLicense.length() - 1);
}
String url = "https://spdx.org/licenses/" + firstLicense + ".html"; String url = "https://spdx.org/licenses/" + firstLicense + ".html";
if (uriIsSetAndCanBeOpened(url)) { if (uriIsSetAndCanBeOpened(url)) {
addLinkItemView(contentView, R.string.menu_license, R.drawable.ic_license, url, app.license); addLinkItemView(contentView, R.string.menu_license, R.drawable.ic_license, url, app.license);