From ecaf2362f22dcee612870e308b60d43c256b7770 Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@guardianproject.info>
Date: Tue, 11 Apr 2017 14:50:40 +0000
Subject: [PATCH] Revert "Merge branch 'replicant-fsdg-compliance' into
 'master'"

This reverts merge request !452
---
 .../org/fdroid/fdroid/RepoXMLHandler.java     | 27 +------------------
 1 file changed, 1 insertion(+), 26 deletions(-)

diff --git a/app/src/main/java/org/fdroid/fdroid/RepoXMLHandler.java b/app/src/main/java/org/fdroid/fdroid/RepoXMLHandler.java
index 250b21390..df9b625d1 100644
--- a/app/src/main/java/org/fdroid/fdroid/RepoXMLHandler.java
+++ b/app/src/main/java/org/fdroid/fdroid/RepoXMLHandler.java
@@ -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;
-    }
 }