Add NonFreeAssets anti-feature

diff --git a/docs/fdroid.texi b/docs/fdroid.texi
index 7b94dc69e3e2de4f62012308afdd3c6b3042dbd6..ef313b3bae4ca8b8677d4c375643de2f9620f34c 100644 (file)
--- a/docs/fdroid.texi
+++ b/docs/fdroid.texi
@@ -1155,6 +1155,11 @@ This does not mean that non-free software is included with the app: Most
 likely, it has been patched in some way to remove the non-free code. However,
 functionality may be missing.
 
+@item
+@samp{NonFreeAssets} - the application contains and makes use of non-free
+assets. The most common case is apps using artwork - images, sounds, music,
+etc - under a non-commercial license.
+
 @end itemize
 
 @node Disabled

diff --git a/fdroidserver/metadata.py b/fdroidserver/metadata.py
index a200d3fd41c195b6f893d51c58afd5dded69e31f..7a3696b9ae5ab6aef96fa5894adfa7a8fa355f1e 100644 (file)
--- a/fdroidserver/metadata.py
+++ b/fdroidserver/metadata.py
@@ -466,7 +466,8 @@ valuetypes = {
                    []),
 
     FieldValidator("Anti-Feature",
-                   ["Ads", "Tracking", "NonFreeNet", "NonFreeDep", "NonFreeAdd", "UpstreamNonFree"], ',',
+                   ["Ads", "Tracking", "NonFreeNet", "NonFreeDep", "NonFreeAdd",
+                       "UpstreamNonFree", "NonFreeAssets"], ',',
                    ["AntiFeatures"],
                    []),
 

diff --git a/wp-fdroid/wp-fdroid.php b/wp-fdroid/wp-fdroid.php
index 9fa074e0e4b2870acceb82e4ec0034b499582669..0a13a6386fbb9ce7f2ad09df4f041518652c7264 100644 (file)
--- a/wp-fdroid/wp-fdroid.php
+++ b/wp-fdroid/wp-fdroid.php
@@ -653,6 +653,8 @@ class FDroid
                $antifeatureDescription['NonFreeDep']['description'] = 'This application depends on another non-Free application.';
                $antifeatureDescription['UpstreamNonFree']['name'] = 'Upstream Non-Free';
                $antifeatureDescription['UpstreamNonFree']['description'] = 'The upstream source code is non-free.';
+               $antifeatureDescription['NonFreeAssets']['name'] = 'Non-Free Assets';
+               $antifeatureDescription['NonFreeAssets']['description'] = 'This application contains non-free assets.';
 
                if(isset($antifeatureDescription[$antifeature])) {
                        return $antifeatureDescription[$antifeature];