From 1c9fc125e205403cc1dfa1ff06325d93881889cd Mon Sep 17 00:00:00 2001
From: linsui <linsui555@gmail.com>
Date: Mon, 30 Oct 2023 17:29:04 +0800
Subject: [PATCH] schema: AutoUpdateMode must be None if UpdateCheckMode is not
 Tags or HTTP

---
 ....cap_rel.fr.sagc_plongee.fr.nitroxCalc.yml |  2 +-
 metadata/org.fdroid.fdroid.privileged.yml     |  2 +-
 metadata/org.mupen64plusae.v3.alpha.yml       |  2 +-
 metadata/protect.card_locker.yml              |  4 +--
 schemas/metadata.json                         | 29 +++++++++++++++++--
 5 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/metadata/fr.cap_rel.fr.sagc_plongee.fr.nitroxCalc.yml b/metadata/fr.cap_rel.fr.sagc_plongee.fr.nitroxCalc.yml
index e97aa37ef5..158cc9d9c2 100644
--- a/metadata/fr.cap_rel.fr.sagc_plongee.fr.nitroxCalc.yml
+++ b/metadata/fr.cap_rel.fr.sagc_plongee.fr.nitroxCalc.yml
@@ -27,7 +27,7 @@ Builds:
 MaintainerNotes: ' UpdateCheckMode disabled because checkupdates sets it to an old
   version'
 
-AutoUpdateMode: Version release-%v
+AutoUpdateMode: None
 UpdateCheckMode: None
 CurrentVersion: 0.6.0
 CurrentVersionCode: 6008
diff --git a/metadata/org.fdroid.fdroid.privileged.yml b/metadata/org.fdroid.fdroid.privileged.yml
index 4e8e6fe05b..8c05a20afe 100644
--- a/metadata/org.fdroid.fdroid.privileged.yml
+++ b/metadata/org.fdroid.fdroid.privileged.yml
@@ -129,7 +129,7 @@ MaintainerNotes: |-
   is needed for the OTA bundle, since that just includes this APK via a
   script.
 
-AutoUpdateMode: Version %v
+AutoUpdateMode: None
 UpdateCheckMode: None
 CurrentVersion: 0.2.7
 CurrentVersionCode: 2070
diff --git a/metadata/org.mupen64plusae.v3.alpha.yml b/metadata/org.mupen64plusae.v3.alpha.yml
index a1e0a2aecf..b1dce1500e 100644
--- a/metadata/org.mupen64plusae.v3.alpha.yml
+++ b/metadata/org.mupen64plusae.v3.alpha.yml
@@ -178,7 +178,7 @@ Builds:
 
 MaintainerNotes: UpdateCheckMode disabled because checkupdates sets it to an old version
 
-AutoUpdateMode: Version v%v
+AutoUpdateMode: None
 UpdateCheckMode: None
 CurrentVersion: 3.0.246 (beta)
 CurrentVersionCode: 246
diff --git a/metadata/protect.card_locker.yml b/metadata/protect.card_locker.yml
index abb8d051bf..a29407bbb9 100644
--- a/metadata/protect.card_locker.yml
+++ b/metadata/protect.card_locker.yml
@@ -293,7 +293,7 @@ Builds:
     gradle:
       - yes
 
-AutoUpdateMode: Version v%v
-UpdateCheckMode: Static
+AutoUpdateMode: None
+UpdateCheckMode: None
 CurrentVersion: '0.28'
 CurrentVersionCode: 39
diff --git a/schemas/metadata.json b/schemas/metadata.json
index 18db7218ec..2b50aa8d0e 100644
--- a/schemas/metadata.json
+++ b/schemas/metadata.json
@@ -674,9 +674,6 @@
       },
       "then": {
         "properties": {
-          "AutoUpdateMode": {
-            "const": "None"
-          },
           "UpdateCheckMode": {
             "const": "None"
           }
@@ -729,6 +726,32 @@
           }
         }
       }
+    },
+    {
+      "if": {
+        "properties": {
+          "UpdateCheckMode": {
+            "anyOf": [
+              {
+                "enum": [
+                  "None",
+                  "Static"
+                ]
+              },
+              {
+                "pattern": "^RepoManifest(/.+)?$"
+              }
+            ]
+          }
+        }
+      },
+      "then": {
+        "properties": {
+          "AutoUpdateMode": {
+            "const": "None"
+          }
+        }
+      }
     }
   ],
   "additionalProperties": false,