Merge pull request #1725 from ImranR98/dev

- Attempt bugfix for error when on VPN (#1120)
- Translation fixes (#1699)
- GitHub search bugfix (#1705)
- Fix missing trailing slash for path-less URLs (#1715)
- Rename Codeberg to Forgejo (#1722)
- Rename "Version String Extraction" to "Trim Version String" for non-HTML Sources (#1723)

.github/workflows/release.yml

@@ -6,6 +6,9 @@ on:
       beta:
         type: boolean
         description: Is beta?
+      draft:
+        type: boolean
+        description: Is draft?
 
 jobs:
   build:
@@ -35,13 +38,7 @@ jobs:
       - name: Check submodule
         id: check_submodule
         run: |
-          SUBMODULE_COMMIT_LONG="$(git submodule status | head -1 | tail -c +2 | awk '{print $1}')"
+          git checkout ${{ inputs.checkout }}
-          FLUTTER_COMMIT_SHORT="$(flutter --version | head -2 | tail -1 | awk '{print $4}')"
-          echo "SUBMODULE_COMMIT_LONG=$SUBMODULE_COMMIT_LONG, FLUTTER_COMMIT_SHORT=$FLUTTER_COMMIT_SHORT"
-          if ! [[ "$SUBMODULE_COMMIT_LONG" =~ ^$FLUTTER_COMMIT_SHORT ]]; then
-            echo "Your submodule has not been updated!"
-            exit 1
-          fi
 
       - name: Extract Version
         id: extract_version      
@@ -92,5 +89,6 @@ jobs:
           token: ${{ secrets.GH_ACCESS_TOKEN }}
           tag: "${{ steps.extract_version.outputs.tag }}"
           prerelease: "${{ steps.extract_version.outputs.beta }}"
+          draft: "${{ inputs.draft }}"
           artifacts: ./build/app/outputs/flutter-apk/*-release*.apk*
           generateReleaseNotes: true

README.md

@@ -16,7 +16,7 @@ Currently supported App sources:
 - Open Source - General:
   - [GitHub](https://github.com/)
   - [GitLab](https://gitlab.com/)
-  - [Codeberg](https://codeberg.org/)
+  - [Forgejo](https://forgejo.org/) ([Codeberg](https://codeberg.org/))
   - [F-Droid](https://f-droid.org/)
   - Third Party F-Droid Repos
   - [IzzyOnDroid](https://android.izzysoft.de/)

assets/translations/bs.json

@@ -24,7 +24,7 @@
     "colour": "Boja",
     "standard": "Standard",
     "custom": "Custom",
-    "useMaterialYou": "Use Material You",
+    "useMaterialYou": "Koristi Material You temu",
     "githubStarredRepos": "GitHub repo-i sa zvjezdicom",
     "uname": "Korisničko ime",
     "wrongArgNum": "Naveden je pogrešan broj argumenata",
@@ -113,7 +113,7 @@
     "dark": "Tamna",
     "light": "Svijetla",
     "followSystem": "Pratite sistem",
-    "followSystemThemeExplanation": "Following system theme is possible only by using third-party applications",
+    "followSystemThemeExplanation": "Praćenje sistemske teme je moguće jedino koristeći aplikacije treće strane",
     "useBlackTheme": "Koristite čisto crnu tamnu temu",
     "appSortBy": "Aplikacije sortirane po",
     "authorName": "Autor/Ime",
@@ -147,10 +147,10 @@
     "noNewUpdates": "Nema novih ažuriranja.",
     "xHasAnUpdate": "{} ima ažuriranje.",
     "appsUpdated": "Aplikacije su ažurirane",
-    "appsNotUpdated": "Failed to update applications",
+    "appsNotUpdated": "Neuspješno ažuriranje aplikacija",
     "appsUpdatedNotifDescription": "Obavještava korisnika da su u pozadini primijenjena ažuriranja na jednu ili više aplikacija",
     "xWasUpdatedToY": "{} je ažuriran na {}.",
-    "xWasNotUpdatedToY": "Failed to update {} to {}.",
+    "xWasNotUpdatedToY": "Neuspješno ažuriranje {} na {}.",
     "errorCheckingUpdates": "Greška pri provjeri ažuriranja",
     "errorCheckingUpdatesNotifDescription": "Obavijest koja se prikazuje kada provjera sigurnosnog ažuriranja ne uspije",
     "appsRemoved": "Aplikacije su uklonjene",
@@ -191,7 +191,7 @@
     "downloadingX": "Preuzimanje {}",
     "downloadX": "Download {}",
     "downloadedX": "Downloaded {}",
-    "releaseAsset": "Release Asset",
+    "releaseAsset": "Fajlovi verzije",
     "downloadNotifDescription": "Obavještava korisnika o napretku u preuzimanju aplikacije",
     "noAPKFound": "APK nije pronađen",
     "noVersionDetection": "Nema detekcije verzije",
@@ -253,12 +253,14 @@
     "verifyLatestTag": "Provjerite 'posljednu' ('latest') oznaku",
     "intermediateLinkRegex": "Filter za 'srednju' vezu za posjetu",
     "filterByLinkText": "Filtriraj linkove prema tekstu linka",
-    "intermediateLinkNotFound": "Intermediate link nije nađen",
+    "intermediateLinkNotFound": "Intermediate veza nije nađena",
-    "intermediateLink": "srednja karika",
+    "intermediateLink": "Intermediate veza",
     "exemptFromBackgroundUpdates": "Izuzmi iz ažuriranja u pozadini (ako su uključeni)",
     "bgUpdatesOnWiFiOnly": "Isključite ažuriranje u pozadini kada niste na WiFi-ju",
     "autoSelectHighestVersionCode": "Automatski izaberite najveću (verziju) versionCode APK-a",
     "versionExtractionRegEx": "RegEx ekstrakcija verzije",
+    "trimVersionString": "Trim Version String With RegEx",
+    "matchGroupToUseForX": "Match Group to Use for \"{}\"",
     "matchGroupToUse": "Podjesite grupu za upotebu",
     "highlightTouchTargets": "Istaknite manje vidljive touch mete",
     "pickExportDir": "Izaberite datoteku za izvoz",
@@ -288,11 +290,11 @@
     "supportFixedAPKURL": "Podržite fiksne APK URL-ove",
     "selectX": "Izaberite {}",
     "parallelDownloads": "Dozvoli paralelna preuzimanja",
-    "useShizuku": "Use Shizuku or Sui to install",
+    "useShizuku": "Koristi Shizuku ili Sui za instaliranje",
-    "shizukuBinderNotFound": "Shizuku is not running",
+    "shizukuBinderNotFound": "Shizuku nije pokrenut",
-    "shizukuOld": "Old Shizuku version (<11) - update it",
+    "shizukuOld": "Stara Shizuku verzija (<11) - ažurirajte je",
-    "shizukuOldAndroidWithADB": "Shizuku running on Android < 8.1 with ADB - update Android or use Sui instead",
+    "shizukuOldAndroidWithADB": "Shizuku pokrenut na Android-u < 8.1 pomoću ADB-a - ažurirajte Android ili koristite Sui",
-    "shizukuPretendToBeGooglePlay": "Set Google Play as the installation source (if Shizuku is used)",
+    "shizukuPretendToBeGooglePlay": "Postavi Google Play kao izvor instalacije (samo ako je Shizuku u upotrebi)",
     "useSystemFont": "Koristite sistemski font",
     "useVersionCodeAsOSVersion": "Koristite kod verzije aplikacije kao verziju koju je otkrio OS",
     "requestHeader": "Zaglavlje zahtjeva",
@@ -305,13 +307,13 @@
     "installed": "Instalirano",
     "latest": "Najnoviji",
     "invertRegEx": "Obrni regularni izraz",
-    "note": "Note",
+    "note": "Zabelješke",
-    "selfHostedNote": "The \"{}\" dropdown can be used to reach self-hosted/custom instances of any source.",
+    "selfHostedNote": "\"{}\" padajući meni se može koristiti da dosegnete vlastite/prilagođene instance bilo kojeg izvora.",
-    "badDownload": "The APK could not be parsed (incompatible or partial download)",
+    "badDownload": "APK ne može biti raščlanjen (nekomaptibilno ili delimično preuzimanje)",
-    "beforeNewInstallsShareToAppVerifier": "Share new Apps with AppVerifier (if available)",
+    "beforeNewInstallsShareToAppVerifier": "Dijeli nove aplikacije sa AppVerifier-om (ako je dostupno)",
-    "appVerifierInstructionToast": "Share to AppVerifier, then return here when ready.",
+    "appVerifierInstructionToast": "Dijeli sa AppVerifier-om, zatim se vratite kada ste spremni.",
-    "wiki": "Help/Wiki",
+    "wiki": "Pomoć/Wiki",
-    "crowdsourcedConfigsLabel": "Crowdsourced App Configurations (use at your own risk)",
+    "crowdsourcedConfigsLabel": "Konfiguracije aplikacije obezbeđene pomoću velikog broja ljudi (crowdsourcing) (koristite na svoju odgovornost)",
     "removeAppQuestion": {
         "one": "Želite li ukloniti aplikaciju?",
         "other": "Želite li ukloniti aplikacije?"
@@ -370,6 +372,6 @@
     },
     "apk": {
         "one": "{} APK",
-        "other": "{} APKs"
+        "other": "{} APK-a"
     }
 }

assets/translations/cs.json

@@ -259,6 +259,8 @@
     "bgUpdatesOnWiFiOnly": "Deaktivovat aktualizace na pozadí, pokud není k dispozici Wi-Fi",
     "autoSelectHighestVersionCode": "Automaticky vybrat nejvyšší verzi APK",
     "versionExtractionRegEx": "Extrakce verze pomocí RegEx",
+    "trimVersionString": "Oříznutí řetězce verze pomocí příkazu RegEx",
+    "matchGroupToUseForX": "Skupina shody, která se použije pro \"{}\"",
     "matchGroupToUse": "Odpovídá použité skupině",
     "highlightTouchTargets": "Zvýraznit méně zjevné cíle dotyku",
     "pickExportDir": "Vybrat adresář pro export",

assets/translations/da.json

@@ -259,6 +259,8 @@
     "bgUpdatesOnWiFiOnly": "Deaktivér baggrundsopdateringer, når du ikke er på WiFi",
     "autoSelectHighestVersionCode": "Auto-vælg højeste versionKode af APK",
     "versionExtractionRegEx": "RegEx for versionsstrengsudtrækning",
+    "trimVersionString": "Trim versionsstrengen med RegEx",
+    "matchGroupToUseForX": "Matchgruppe til brug for \"{}\"",
     "matchGroupToUse": "Match gruppe til brug til RegEx for versionsstrengsudtrækning",
     "highlightTouchTargets": "Fremhæv mindre åbenlyse berøringsmål",
     "pickExportDir": "Vælg eksportmappe",
@@ -305,7 +307,7 @@
     "installed": "Installeret",
     "latest": "Seneste",
     "invertRegEx": "Inverter regulært udtryk",
-    "note": "Note",
+    "note": "Bemærk",
     "selfHostedNote": "Rullemenuen \"{}\" kan bruges til at nå selvhostede/brugerdefinerede instanser af enhver kilde.",
     "badDownload": "APK'en kunne ikke analyseres (inkompatibel eller delvis hentning)",
     "beforeNewInstallsShareToAppVerifier": "Del nye apps med AppVerifier (hvis tilgængelig)",

assets/translations/de.json

@@ -259,6 +259,8 @@
     "bgUpdatesOnWiFiOnly": "Hintergrundaktualisierungen deaktivieren, wenn kein WLAN vorhanden ist",
     "autoSelectHighestVersionCode": "Automatisch höchste APK-Version auswählen",
     "versionExtractionRegEx": "Versions-Extraktion per RegEx",
+    "trimVersionString": "Trim Version String mit RegEx",
+    "matchGroupToUseForX": "Zu verwendende Abgleichsgruppe für \"{}\"",
     "matchGroupToUse": "zu verwendende Gruppe abgleichen",
     "highlightTouchTargets": "Weniger offensichtliche Touch-Ziele hervorheben",
     "pickExportDir": "Export-Verzeichnis wählen",
@@ -329,12 +331,12 @@
         "other": "Die Hintergrundaktualisierungsprüfung fand {} Aktualisierungen – benachrichtigt den Benutzer, falls erforderlich"
     },
     "apps": {
-        "eine": "{} App",
+        "one": "{} App",
-        "andere": "{} Apps"
+        "other": "{} Apps"
     },
     "url": {
-        "eine": "{} URL",
+        "one": "{} URL",
-        "andere": "{} URLs"
+        "other": "{} URLs"
     },
     "minute": {
         "one": "{} Minute",

assets/translations/en.json

@@ -259,6 +259,8 @@
     "bgUpdatesOnWiFiOnly": "Disable background updates when not on WiFi",
     "autoSelectHighestVersionCode": "Auto-select highest versionCode APK",
     "versionExtractionRegEx": "Version String Extraction RegEx",
+    "trimVersionString": "Trim Version String With RegEx",
+    "matchGroupToUseForX": "Match Group to Use for \"{}\"",
     "matchGroupToUse": "Match Group to Use for Version String Extraction RegEx",
     "highlightTouchTargets": "Highlight less obvious touch targets",
     "pickExportDir": "Pick Export Directory",

assets/translations/es.json

@@ -259,6 +259,8 @@
     "bgUpdatesOnWiFiOnly": "Deshabilitar las actualizaciones en segundo plano sin WiFi",
     "autoSelectHighestVersionCode": "Auto selección del paquete APK con versión más reciente",
     "versionExtractionRegEx": "Versión de extracción regex",
+    "trimVersionString": "Recortar cadena de versión con RegEx",
+    "matchGroupToUseForX": "Grupo de coincidencia a utilizar para \"{}\"",
     "matchGroupToUse": "Grupo a usar para versión de extracción regex",
     "highlightTouchTargets": "Resaltar objetivos menos obvios",
     "pickExportDir": "Directorio para exportar",
@@ -333,8 +335,8 @@
         "other": "{} Aplicaciones"
     },
     "url": {
-        "uno": "{} URL",
+        "one": "{} URL",
-        "otro": "{} URL"
+        "other": "{} URL"
     },
     "minute": {
         "one": "{} minuto",

assets/translations/fa.json

@@ -259,6 +259,8 @@
     "bgUpdatesOnWiFiOnly": "به‌روزرسانی‌های پس‌زمینه را در صورت عدم اتصال به WiFi غیرفعال کنید",
     "autoSelectHighestVersionCode": "انتخاب خودکار بالاترین نسخه کد APK",
     "versionExtractionRegEx": "نسخه استخراج RegEx",
+    "trimVersionString": "Trim Version String With RegEx",
+    "matchGroupToUseForX": "Match Group to Use for \"{}\"",
     "matchGroupToUse": "گروه مورد استفاده را مطابقت دهید",
     "highlightTouchTargets": "اهداف لمسی کمتر واضح را برجسته کنید",
     "pickExportDir": "فهرست برون ریزی را انتخاب کنید",

assets/translations/fr.json

@@ -259,6 +259,8 @@
     "bgUpdatesOnWiFiOnly": "Désactiver les mises à jour en arrière-plan lorsque vous n'êtes pas connecté au WiFi",
     "autoSelectHighestVersionCode": "Sélection automatique du code de version le plus élevé de l'APK",
     "versionExtractionRegEx": "Expression régulière d'extraction de version",
+    "trimVersionString": "Découper une chaîne de version avec RegEx",
+    "matchGroupToUseForX": "Groupe de correspondance à utiliser pour \"{}\"",
     "matchGroupToUse": "Groupe de correspondance pour l'expression régulière d'extraction de version",
     "highlightTouchTargets": "Mettre en évidence les cibles tactiles moins évidentes",
     "pickExportDir": "Choisir le répertoire d'exportation",

assets/translations/hu.json

@@ -259,6 +259,8 @@
     "bgUpdatesOnWiFiOnly": "Tiltsa le a háttérben frissítéseket, ha nincs Wi-Fi-n",
     "autoSelectHighestVersionCode": "A legmagasabb verziószámú APK auto. kiválasztása",
     "versionExtractionRegEx": "Verzió kibontása reguláris kifejezéssel",
+    "trimVersionString": "Trim Version String RegEx-szel",
+    "matchGroupToUseForX": "A \"{}\" csoporthoz használandó csoport egyeztetése",
     "matchGroupToUse": "Párosítsa a csoportot a használathoz",
     "highlightTouchTargets": "Emelje ki a kevésbé nyilvánvaló érintési célokat",
     "pickExportDir": "Válassza az Exportálási könyvtárat",

assets/translations/it.json

@@ -259,6 +259,8 @@
     "bgUpdatesOnWiFiOnly": "Disattiva aggiornamenti in secondo piano quando non si usa il WiFi",
     "autoSelectHighestVersionCode": "Auto-seleziona APK con versionCode più alto",
     "versionExtractionRegEx": "RegEx di estrazione versione",
+    "trimVersionString": "Tagliare la stringa della versione con RegEx",
+    "matchGroupToUseForX": "Gruppo di corrispondenza da utilizzare per \"{}\"",
     "matchGroupToUse": "Gruppo da usare",
     "highlightTouchTargets": "Evidenzia elementi toccabili meno ovvi",
     "pickExportDir": "Scegli cartella esp.",

assets/translations/ja.json

@@ -259,6 +259,8 @@
     "bgUpdatesOnWiFiOnly": "WiFiを使用していない場合、バックグラウンドアップデートを無効にする",
     "autoSelectHighestVersionCode": "最も高いバージョンコードのAPKを自動で選択する",
     "versionExtractionRegEx": "バージョン抽出の正規表現",
+    "trimVersionString": "RegExでバージョン文字列をトリムする",
+    "matchGroupToUseForX": "\"{}\"に使用するマッチグループ",
     "matchGroupToUse": "使用するマッチしたグループ",
     "highlightTouchTargets": "目立たないタップ可能な対象をハイライトする",
     "pickExportDir": "エクスポートディレクトリを選択",

assets/translations/nl.json

@@ -259,6 +259,8 @@
     "bgUpdatesOnWiFiOnly": "Achtergrond-updates uitschakelen wanneer niet verbonden met WiFi",
     "autoSelectHighestVersionCode": "De APK met de hoogste versiecode automatisch selecteren",
     "versionExtractionRegEx": "Reguliere expressie voor versie-extractie",
+    "trimVersionString": "Versie string trimmen met RegEx",
+    "matchGroupToUseForX": "Overeenkomende groep te gebruiken voor \"{}\"",
     "matchGroupToUse": "Overeenkomende groep om te gebruiken voor de reguliere expressie voor versie-extractie",
     "highlightTouchTargets": "Minder voor de hand liggende aanraakdoelen markeren.",
     "pickExportDir": "Kies de exportmap",

assets/translations/pl.json

@@ -259,6 +259,8 @@
     "bgUpdatesOnWiFiOnly": "Wyłącz aktualizacje w tle, gdy nie ma połączenia z Wi-Fi",
     "autoSelectHighestVersionCode": "Automatycznie wybierz najwyższy kod wersji APK",
     "versionExtractionRegEx": "Wyrażenie regularne wyodrębniające wersję",
+    "trimVersionString": "Przycinanie łańcucha wersji za pomocą RegEx",
+    "matchGroupToUseForX": "Dopasuj grupę do użycia dla \"{}\"",
     "matchGroupToUse": "Dopasuj grupę do użycia dla wyrażenia regularnego wyodrębniania wersji",
     "highlightTouchTargets": "Wyróżnij mniej oczywiste elementy dotykowe",
     "pickExportDir": "Wybierz katalog eksportu",

assets/translations/pt.json

@@ -259,6 +259,8 @@
     "bgUpdatesOnWiFiOnly": "Desative as atualizações em segundo-plano quando não estiver conectado no Wi-Fi",
     "autoSelectHighestVersionCode": "Auto-selecionar a versão mais recente",
     "versionExtractionRegEx": "Regex de extração de versão",
+    "trimVersionString": "Cortar a cadeia de caracteres da versão com RegEx",
+    "matchGroupToUseForX": "Grupo de correspondência a utilizar para \"{}\"",
     "matchGroupToUse": "Grupo correspondente a ser usado no Regex de extração de versão",
     "highlightTouchTargets": "Realçar áreas sensíveis ao toque que são menos óbvias",
     "pickExportDir": "Escolher diretório para exportação",

assets/translations/ru.json

@@ -129,7 +129,7 @@
     "pinUpdates": "Отображать обновления приложений сверху списка",
     "updates": "Обновления",
     "sourceSpecific": "Настройки источников",
-    "appSource": "Исходный код",
+    "appSource": "Источник",
     "noLogs": "Нет журналов",
     "appLogs": "Логи",
     "close": "Закрыть",
@@ -259,6 +259,8 @@
     "bgUpdatesOnWiFiOnly": "Отключить фоновые обновления, если нет соединения с Wi-Fi",
     "autoSelectHighestVersionCode": "Автоматически выбирать APK с актуальной версией кода",
     "versionExtractionRegEx": "Регулярное выражение для извлечения версии",
+    "trimVersionString": "Обрезка строки версии с помощью RegEx",
+    "matchGroupToUseForX": "Группа соответствия, которую следует использовать для \"{}\"",
     "matchGroupToUse": "Выберите группу для использования",
     "highlightTouchTargets": "Выделить менее очевидные элементы управления касанием",
     "pickExportDir": "Выбрать каталог для экспорта",

assets/translations/sv.json

@@ -259,6 +259,8 @@
     "bgUpdatesOnWiFiOnly": "Inaktivera Bakgrundsuppdateringar utan WiFi",
     "autoSelectHighestVersionCode": "Välj automatiskt högsta versionskod APK",
     "versionExtractionRegEx": "Version Extraction RegEx",
+    "trimVersionString": "Trimma versionssträng med RegEx",
+    "matchGroupToUseForX": "Matchningsgrupp att använda för \"{}\"",
     "matchGroupToUse": "Match Group to Use",
     "highlightTouchTargets": "Markera mindre uppenbara beröringsobjekt",
     "pickExportDir": "Välj Exportsökväg",

assets/translations/tr.json

@@ -259,6 +259,8 @@
     "bgUpdatesOnWiFiOnly": "WiFi olmadığında arka plan güncellemelerini devre dışı bırak",
     "autoSelectHighestVersionCode": "Otomatik olarak en yüksek sürüm kodunu seç",
     "versionExtractionRegEx": "Sürüm Çıkarma Düzenli İfade",
+    "trimVersionString": "RegEx ile Sürüm Dizesini Kırpma",
+    "matchGroupToUseForX": "\"{}\" için Kullanılacak Grubu Eşleştirin",
     "matchGroupToUse": "Sürüm Çıkarma Regex için Kullanılacak Eşleşme Grubu",
     "highlightTouchTargets": "Daha az belirgin dokunma hedeflerini vurgula",
     "pickExportDir": "Dışa Aktarılacak Klasörü Seç",

assets/translations/uk.json

@@ -259,6 +259,8 @@
     "bgUpdatesOnWiFiOnly": "Вимкнути фонові оновлення поза Wi-Fi",
     "autoSelectHighestVersionCode": "Автоматичний вибір APK з найвищим кодом версії",
     "versionExtractionRegEx": "Регулярний вираз для вилучення рядка версії",
+    "trimVersionString": "Обрізати рядок версії за допомогою RegEx",
+    "matchGroupToUseForX": "Група збігів для \"{}\"",
     "matchGroupToUse": "Група співпадінь для використання в регулярному виразі вилучення версії",
     "highlightTouchTargets": "Підсвічувати менш очевидні області дотику",
     "pickExportDir": "Вибрати каталог експорту",

assets/translations/vi.json

@@ -259,6 +259,8 @@
     "bgUpdatesOnWiFiOnly": "Tắt cập nhật nền khi không có WiFi",
     "autoSelectHighestVersionCode": "Tự động chọn APK mã phiên bản cao nhất",
     "versionExtractionRegEx": "Trích xuất phiên bản RegEx",
+    "trimVersionString": "Trim Version String With RegEx",
+    "matchGroupToUseForX": "Match Group to Use for \"{}\"",
     "matchGroupToUse": "Nhóm đối sánh để sử dụng cho Regex trích xuất phiên bản",
     "highlightTouchTargets": "Đánh dấu các mục tiêu cảm ứng ít rõ ràng hơn",
     "pickExportDir": "Chọn thư mục xuất",

assets/translations/zh-TW.json

@@ -259,6 +259,8 @@
     "bgUpdatesOnWiFiOnly": "禁用非 WiFi 的背景更新",
     "autoSelectHighestVersionCode": "自動選擇最高 versionCode 的 APK",
     "versionExtractionRegEx": "版本字串提取正則表達式",
+    "trimVersionString": "Trim Version String With RegEx",
+    "matchGroupToUseForX": "Match Group to Use for \"{}\"",
     "matchGroupToUse": "要用於版本字串提取的匹配組",
     "highlightTouchTargets": "突出顯示不明顯的觸控目標",
     "pickExportDir": "選擇匯出目錄",

assets/translations/zh.json

@@ -259,6 +259,8 @@
     "bgUpdatesOnWiFiOnly": "未连接 Wi-Fi 时禁用后台更新",
     "autoSelectHighestVersionCode": "自动选择内部版本号最高的 APK 文件",
     "versionExtractionRegEx": "提取版本号的正则表达式",
+    "trimVersionString": "使用 RegEx 修剪版本字符串",
+    "matchGroupToUseForX": "用于\"{}\"的匹配组",
     "matchGroupToUse": "从上述匹配结果中引用的捕获组",
     "highlightTouchTargets": "突出展示不明显的可交互区域",
     "pickExportDir": "选择导出文件夹",

fastlane/metadata/android/en-US/full_description.txt

@@ -9,7 +9,7 @@
 		<ul>
 			<li>GitHub</li>
 			<li>GitLab</li>
-			<li>Codeberg</li>
+			<li>Forgejo (Codeberg)</li>
 			<li>F-Droid</li>
 			<li>Third Party F-Droid Repos</li>
 			<li>IzzyOnDroid</li>

fastlane/metadata/android/ru/full_description.txt

@@ -9,7 +9,7 @@
 		<ul>
 			<li>GitHub</li>
 			<li>GitLab</li>
-			<li>Codeberg</li>
+			<li>Forgejo (Codeberg)</li>
 			<li>F-Droid</li>
 			<li>Third Party F-Droid Repos</li>
 			<li>IzzyOnDroid</li>

lib/app_sources/codeberg.dart

@@ -5,6 +5,7 @@ import 'package:obtainium/providers/source_provider.dart';
 class Codeberg extends AppSource {
   GitHub gh = GitHub();
   Codeberg() {
+    name = 'Forgejo (Codeberg)';
     hosts = ['codeberg.org'];
 
     additionalSourceAppSpecificSettingFormItems =

lib/app_sources/github.dart

@@ -171,7 +171,7 @@ class GitHub extends AppSource {
       {bool forAPKDownload = false}) async {
     var token = await getTokenIfAny(additionalSettings);
     var headers = <String, String>{};
-    if (token != null) {
+    if (token != null && token.isNotEmpty) {
       headers[HttpHeaders.authorizationHeader] = 'Token $token';
     }
     if (forAPKDownload == true) {

lib/app_sources/html.dart

@@ -93,6 +93,21 @@ bool _isNumeric(String s) {
 }
 
 class HTML extends AppSource {
+  @override
+  List<List<GeneratedFormItem>> get combinedAppSpecificSettingFormItems {
+    return super.combinedAppSpecificSettingFormItems.map((r) {
+      return r.map((e) {
+        if (e.key == 'versionExtractionRegEx') {
+          e.label = tr('versionExtractionRegEx');
+        }
+        if (e.key == 'matchGroupToUse') {
+          e.label = tr('matchGroupToUse');
+        }
+        return e;
+      }).toList();
+    }).toList();
+  }
+
   var finalStepFormitems = [
     [
       GeneratedFormTextField('customLinkFilterRegex',

lib/providers/apps_provider.dart

@@ -1770,7 +1770,9 @@ Future<void> bgUpdateCheck(String taskId, Map<String, dynamic>? params) async {
   int maxRetryWaitSeconds = 5;
 
   var netResult = await (Connectivity().checkConnectivity());
-  if (netResult.contains(ConnectivityResult.none)) {
+  if (netResult.contains(ConnectivityResult.none) ||
+      netResult.isEmpty ||
+      (netResult.contains(ConnectivityResult.vpn) && netResult.length == 1)) {
     logs.add('BG update task: No network.');
     return;
   }

lib/providers/source_provider.dart

@@ -355,8 +355,10 @@ preStandardizeUrl(String url) {
     url = 'https://$url';
   }
   var uri = Uri.tryParse(url);
-  var trailingSlash = (uri?.path.endsWith('/') ?? false) &&
+  var trailingSlash = ((uri?.path.endsWith('/') ?? false) ||
+          ((uri?.path.isEmpty ?? false) && url.endsWith('/'))) &&
       (uri?.queryParameters.isEmpty ?? false);
+
   url = url
           .split('/')
           .where((e) => e.isNotEmpty)
@@ -493,13 +495,15 @@ abstract class AppSource {
     ],
     [
       GeneratedFormTextField('versionExtractionRegEx',
-          label: tr('versionExtractionRegEx'),
+          label: tr('trimVersionString'),
           required: false,
           additionalValidators: [(value) => regExValidator(value)]),
     ],
     [
       GeneratedFormTextField('matchGroupToUse',
-          label: tr('matchGroupToUse'), required: false, hint: '\$0')
+          label: tr('matchGroupToUseForX', args: [tr('trimVersionString')]),
+          required: false,
+          hint: '\$0')
     ],
     [
       GeneratedFormSwitch('versionDetection',

pubspec.lock

@@ -47,26 +47,26 @@ packages:
     dependency: "direct main"
     description:
       name: app_links
-      sha256: a9905d6a60e814503fabc7523a9ed161b812d7ca69c99ad8ceea14279dc4f06b
+      sha256: ae5f9a1b7d40d26178f605414be81ed4260350b4fae8259fe5ca4f89fe70c4af
       url: "https://pub.dev"
     source: hosted
-    version: "6.1.3"
+    version: "6.1.4"
   app_links_linux:
     dependency: transitive
     description:
       name: app_links_linux
-      sha256: "567139eca3ca9fb113f2082f3aaa75a26f30f0ebdbe5fa7f09a3913c5bebd630"
+      sha256: f5f7173a78609f3dfd4c2ff2c95bd559ab43c80a87dc6a095921d96c05688c81
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.2"
+    version: "1.0.3"
   app_links_platform_interface:
     dependency: transitive
     description:
       name: app_links_platform_interface
-      sha256: "58cff6f11df59b0e514dd5e4a61e988348ad5662f0e75d45d4e214ebea55c94c"
+      sha256: "05f5379577c513b534a29ddea68176a4d4802c46180ee8e2e966257158772a3f"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.0"
+    version: "2.0.2"
   app_links_web:
     dependency: transitive
     description:
@@ -287,10 +287,10 @@ packages:
     dependency: "direct main"
     description:
       name: file_picker
-      sha256: "2ca051989f69d1b2ca012b2cf3ccf78c70d40144f0861ff2c063493f7c8c3d45"
+      sha256: "824f5b9f389bfc4dddac3dea76cd70c51092d9dff0b2ece7ef4f53db8547d258"
       url: "https://pub.dev"
     source: hosted
-    version: "8.0.5"
+    version: "8.0.6"
   fixnum:
     dependency: transitive
     description:
@@ -311,10 +311,10 @@ packages:
     dependency: transitive
     description:
       name: flex_seed_scheme
-      sha256: "6c595e545b0678e1fe17e8eec3d1fbca7237482da194fadc20ad8607dc7a7f3d"
+      sha256: cb5b7ec4ba525d9846d8992858a1c6cfc88f9466d96b8850e2a061aa5f682539
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.0"
+    version: "3.1.1"
   flutter:
     dependency: "direct main"
     description: flutter
@@ -404,18 +404,18 @@ packages:
     dependency: "direct main"
     description:
       name: flutter_local_notifications
-      sha256: ced76d337f54de33d7d9f06092137b4ac2da5079e00cee8a11a1794ffc7c61c6
+      sha256: dd6676d8c2926537eccdf9f72128bbb2a9d0814689527b17f92c248ff192eaf3
       url: "https://pub.dev"
     source: hosted
-    version: "17.2.1"
+    version: "17.2.1+2"
   flutter_local_notifications_linux:
     dependency: transitive
     description:
       name: flutter_local_notifications_linux
-      sha256: "33f741ef47b5f63cc7f78fe75eeeac7e19f171ff3c3df054d84c1e38bedb6a03"
+      sha256: c49bd06165cad9beeb79090b18cd1eb0296f4bf4b23b84426e37dd7c027fc3af
       url: "https://pub.dev"
     source: hosted
-    version: "4.0.0+1"
+    version: "4.0.1"
   flutter_local_notifications_platform_interface:
     dependency: transitive
     description:
@@ -651,10 +651,10 @@ packages:
     dependency: transitive
     description:
       name: path_provider_android
-      sha256: bca87b0165ffd7cdb9cad8edd22d18d2201e886d9a9f19b4fb3452ea7df3a72a
+      sha256: "30c5aa827a6ae95ce2853cdc5fe3971daaac00f6f081c419c013f7f57bff2f5e"
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.6"
+    version: "2.2.7"
   path_provider_foundation:
     dependency: transitive
     description:
@@ -683,10 +683,10 @@ packages:
     dependency: transitive
     description:
       name: path_provider_windows
-      sha256: "8bc9f22eee8690981c22aa7fc602f5c85b497a6fb2ceb35ee5a5e5ed85ad8170"
+      sha256: bd6f00dbd873bfb70d0761682da2b3a2c2fccc2b9e84c495821639601d81afe7
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.1"
+    version: "2.3.0"
   permission_handler:
     dependency: "direct main"
     description:
@@ -977,10 +977,10 @@ packages:
     dependency: transitive
     description:
       name: timezone
-      sha256: a6ccda4a69a442098b602c44e61a1e2b4bf6f5516e875bbf0f427d5df14745d5
+      sha256: "2236ec079a174ce07434e89fcd3fcda430025eb7692244139a9cf54fdcf1fc7d"
       url: "https://pub.dev"
     source: hosted
-    version: "0.9.3"
+    version: "0.9.4"
   typed_data:
     dependency: transitive
     description:
@@ -1009,10 +1009,10 @@ packages:
     dependency: transitive
     description:
       name: url_launcher_ios
-      sha256: "7068716403343f6ba4969b4173cbf3b84fc768042124bc2c011e5d782b24fe89"
+      sha256: e43b677296fadce447e987a2f519dcf5f6d1e527dc35d01ffab4fff5b8a7063e
       url: "https://pub.dev"
     source: hosted
-    version: "6.3.0"
+    version: "6.3.1"
   url_launcher_linux:
     dependency: transitive
     description:
@@ -1057,10 +1057,10 @@ packages:
     dependency: transitive
     description:
       name: uuid
-      sha256: "814e9e88f21a176ae1359149021870e87f7cddaf633ab678a5d2b0bff7fd1ba8"
+      sha256: "83d37c7ad7aaf9aa8e275490669535c8080377cfa7a7004c24dfac53afffaa90"
       url: "https://pub.dev"
     source: hosted
-    version: "4.4.0"
+    version: "4.4.2"
   vector_math:
     dependency: transitive
     description:
@@ -1113,10 +1113,10 @@ packages:
     dependency: transitive
     description:
       name: webview_flutter_wkwebview
-      sha256: "7affdf9d680c015b11587181171d3cad8093e449db1f7d9f0f08f4f33d24f9a0"
+      sha256: "9c62cc46fa4f2d41e10ab81014c1de470a6c6f26051a2de32111b2ee55287feb"
       url: "https://pub.dev"
     source: hosted
-    version: "3.13.1"
+    version: "3.14.0"
   win32:
     dependency: transitive
     description:

pubspec.yaml

@@ -17,7 +17,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
 # In Windows, build-name is used as the major, minor, and patch parts
 # of the product and file versions while build-number is used as the build suffix.
-version: 1.1.13+2270
+version: 1.1.14+2271
 
 environment:
   sdk: '>=3.0.0 <4.0.0'