fix resource name

.gitea/workflows/build.yml

@@ -113,34 +113,53 @@ jobs:
           python3 scripts/patch_futon_niadd.py \
             work/Futon
 
-          echo "=== Verify Futon build.gradle modification ==="
+          echo "=== Verify applicationId suffix ==="
 
           grep -F "applicationIdSuffix = '.niadd'" \
             work/Futon/app/build.gradle
 
-          echo "=== Verify Niadd resource overlay ==="
+          echo "=== Verify application name ==="
 
-          NIADD_RESOURCES="work/Futon/app/src/debug/res/values/niadd.xml"
+          grep -F '>Futon Niadd</string>' \
+            work/Futon/app/src/debug/res/values/strings.xml
 
-          test -f "${NIADD_RESOURCES}"
+          echo "=== Verify Niadd sync identifiers ==="
 
-          grep -F "Futon Niadd" \
-            "${NIADD_RESOURCES}"
+          grep -F 'io.github.landwarderer.futon.niadd.sync' \
+            work/Futon/app/src/debug/res/values/constants.xml
 
-          grep -F "io.github.landwarderer.futon.niadd.sync" \
-            "${NIADD_RESOURCES}"
+          grep -F 'io.github.landwarderer.futon.niadd.history' \
+            work/Futon/app/src/debug/res/values/constants.xml
 
-          grep -F "io.github.landwarderer.futon.niadd.history" \
-            "${NIADD_RESOURCES}"
+          grep -F 'io.github.landwarderer.futon.niadd.favourites' \
+            work/Futon/app/src/debug/res/values/constants.xml
 
-          grep -F "io.github.landwarderer.futon.niadd.favourites" \
-            "${NIADD_RESOURCES}"
+          echo "=== Ensure old debug identifiers are gone ==="
+
+          if grep -F 'org.futon.debug.sync' \
+            work/Futon/app/src/debug/res/values/constants.xml; then
+            echo "ERROR: old debug sync account type is still present"
+            exit 1
+          fi
+
+          if grep -F 'org.koitharu.futon.debug.history' \
+            work/Futon/app/src/debug/res/values/constants.xml; then
+            echo "ERROR: old debug history authority is still present"
+            exit 1
+          fi
+
+          if grep -F 'org.koitharu.futon.debug.favourites' \
+            work/Futon/app/src/debug/res/values/constants.xml; then
+            echo "ERROR: old debug favourites authority is still present"
+            exit 1
+          fi
 
           echo "=== Futon resulting diff ==="
 
           git -C work/Futon diff -- \
             app/build.gradle \
-            app/src/debug/res/values/niadd.xml
+            app/src/debug/res/values/strings.xml \
+            app/src/debug/res/values/constants.xml
 
           git -C work/Futon diff --check