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

Revert "Merge branch 'replicant-fsdg-compliance' into 'master'"

Browse Source 
This reverts merge request !452
This commit is contained in:
Hans-Christoph Steiner 2017-04-11 14:50:40 +00:00
parent 8e7096b2a8
commit ecaf2362f2
1 changed files with 1 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
app/src/main/java/org/fdroid/fdroid/RepoXMLHandler.java
View File

@ -303,9 +303,7 @@ public class RepoXMLHandler extends DefaultHandler {
}
private void onApplicationParsed() {
if (!replicantFSDGviolation()) {
receiver.receiveApp(curapp, apksList);
}
receiver.receiveApp(curapp, apksList);
curapp = null;
apksList = new ArrayList<>();
// If the app packageName is already present in this apps list, then it
@ -404,27 +402,4 @@ public class RepoXMLHandler extends DefaultHandler {
}
return result;
}
private final String osVersion = System.getProperty("os.version");
/**
* Checks if an app fails to comply with the GNU Free System Distribution
* Guidelines in the case that F-Droid is installed on Replicant.
* Currently, all apps that have at least one of the following anti-features
* violate the guidelines: Tracking, NonFreeAdd, NonFreeDep and NonFreeAssets.
*/
private boolean replicantFSDGviolation() {
if (osVersion == null || !osVersion.contains("replicant")) {
return false;
}
if (curapp.antiFeatures != null && curapp.antiFeatures.length > 0) {
for (String af : curapp.antiFeatures) {
if ("Tracking".equals(af) || "NonFreeAdd".equals(af)
|| "NonFreeDep".equals(af) || "NonFreeAssets".equals(af)) {
return true;
}
}
}
return false;
}
}