From 967472408b1f4efb716f560ce11daf3836879a16 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Daniel=20Mart=C3=AD?= Date: Tue, 29 Dec 2015 12:39:48 +0100 Subject: [PATCH] Add NonFreeAssets anti-feature --- docs/fdroid.texi | 5 +++++ fdroidserver/metadata.py | 3 ++- wp-fdroid/wp-fdroid.php | 2 ++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/docs/fdroid.texi b/docs/fdroid.texi index 7b94dc69..ef313b3b 100644 --- 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 a200d3fd..7a3696b9 100644 --- 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 9fa074e0..0a13a638 100644 --- 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]; -- 2.30.2