Merge branch 'master' into 'master'

NoSourceSince Anti-Feature should only be added to index

See merge request fdroid/fdroidserver!532

.gitlab-ci.yml

@@ -16,7 +16,7 @@ test:
 metadata_v0:
   image: registry.gitlab.com/fdroid/ci-images-server:latest
   variables:
-    RELEASE_COMMIT_ID: 90e3a67cefe89b27afecbdab8e07c9f37ee77a0c  # 1.1a~
+    RELEASE_COMMIT_ID: b03c4a7353541b73b946e3aebb1585b0d20d2ccc  # 1.1a~
   script:
     - git fetch https://gitlab.com/fdroid/fdroidserver $RELEASE_COMMIT_ID
     - cd tests

fdroidserver/metadata.py

@@ -993,9 +993,6 @@ def parse_metadata(metadatapath, check_vcs=False, refresh=True):
 
     post_metadata_parse(app)
 
-    if app.NoSourceSince:
-        app.AntiFeatures.append('NoSourceSince')
-
     if not app.id:
         if app.builds:
             build = app.builds[-1]

fdroidserver/update.py

@@ -1652,6 +1652,9 @@ def apply_info_from_latest_apk(apps, apks):
                     bestver = apk['versionCode']
                     bestapk = apk
 
+                if app.NoSourceSince:
+                    apk['antiFeatures'].add('NoSourceSince')
+
                 if 'added' in apk:
                     if not app.added or apk['added'] < app.added:
                         app.added = apk['added']

tests/metadata/com.politedroid.txt

@@ -28,11 +28,13 @@ Build:1.4,5
 
 Build:1.5,6
     commit=v1.5
-    gradle=yes
     sudo=echo 'this is just a test'
+    gradle=yes
 
 Archive Policy:4 versions
 Auto Update Mode:Version v%v
 Update Check Mode:Tags
 Current Version:1.5
 Current Version Code:6
+
+No Source Since:1.5

tests/repo/index-v1.json

@@ -127,6 +127,9 @@
       }
     },
     {
+      "antiFeatures": [
+        "NoSourceSince"
+      ],
       "categories": [
         "Time"
       ],
@@ -180,6 +183,9 @@
     "com.politedroid": [
       {
         "added": 1498176000000,
+        "antiFeatures": [
+          "NoSourceSince"
+        ],
         "apkName": "com.politedroid_6.apk",
         "hash": "70c2f776a2bac38a58a7d521f96ee0414c6f0fb1de973c3ca8b10862a009247d",
         "hashType": "sha256",
@@ -204,6 +210,9 @@
       },
       {
         "added": 1498176000000,
+        "antiFeatures": [
+          "NoSourceSince"
+        ],
         "apkName": "com.politedroid_5.apk",
         "hash": "5bdbfa071cca4b8d05ced41d6b28763595d6e8096cca5bbf0f9253c9a2622e5d",
         "hashType": "sha256",
@@ -228,6 +237,9 @@
       },
       {
         "added": 1498176000000,
+        "antiFeatures": [
+          "NoSourceSince"
+        ],
         "apkName": "com.politedroid_4.apk",
         "hash": "c809bdff83715fbf919f3840ee09869b038e209378b906e135ee40d3f0e1f075",
         "hashType": "sha256",
@@ -266,6 +278,7 @@
         "added": 1498176000000,
         "antiFeatures": [
           "KnownVuln",
+          "NoSourceSince",
           "NonFreeAssets",
           "UpstreamNonFree"
         ],

tests/repo/index.xml

@@ -237,6 +237,7 @@
 		<tracker>https://github.com/miguelvps/PoliteDroid/issues</tracker>
 		<marketversion>1.5</marketversion>
 		<marketvercode>6</marketvercode>
+		<antifeatures>NoSourceSince</antifeatures>
 		<package>
 			<version>1.5</version>
 			<versioncode>6</versioncode>