Merge pull request #1439 from ImranR98/dev

- Allow any source to be overridden (#1420)
- Bugfix for installing apps with ID change step (#1424)
- Bugfix: 'null' changelog for some track-only apps (#1425)
- Show latest APK name/count on app page (#1426)
- More BG update interval options (#1431)

.github/ISSUE_TEMPLATE/bug_report.md

@@ -10,6 +10,7 @@ assignees: ''
 **Prerequisites**
 <!-- Please ensure your request is not part of an existing issue. -->
 <!-- Please ensure you have checked the Obtainium Wiki. -->
+<!-- Please ensure your request is an actual bug and not intended behaviour (this is frequently the case for issues involving version strings and the HTML source. -->
 
 **Describe the bug**
 <!-- A clear and concise description of what the bug is. -->

.github/ISSUE_TEMPLATE/feature_request.md

@@ -14,11 +14,14 @@ assignees: ''
 **Describe the feature**
 <!-- A clear and concise description of what you want to happen.
 
-For new Sources, it's preferable (not required) if you suggest how the following details can be extracted from the Source in a reliable way (like an API or through web scraping):
+For new Sources, please ensure:
+1. It is not already possible to use the HTML Source for your purposes.
+2. It must be possible to extract the following details from the Source in a reliable way:
 - The App version (or any release-specific identifier - a "pseudo-version") for the latest release
 - One or more APK URL(s) for the latest release
 - Above details for previous releases (optional)
 
+If you're not sure about 1 or 2, open a discussion item instead.
 Note that the Web scraper cannot deal with JavaScript-enabled content. -->
 
 **Describe alternatives you've considered (if applicable)**

README.md

@@ -42,6 +42,12 @@ Currently supported App sources:
 [<img src="https://github.com/machiav3lli/oandbackupx/blob/034b226cea5c1b30eb4f6a6f313e4dadcbb0ece4/badge_github.png"
     alt="Get it on GitHub"
     height="80">](https://github.com/ImranR98/Obtainium/releases)
+[<img src="https://gitlab.com/IzzyOnDroid/repo/-/raw/master/assets/IzzyOnDroid.png"
+     alt="Get it on IzzyOnDroid"
+     height="80">](https://apt.izzysoft.de/fdroid/index/apk/dev.imranr.obtainium)
+[<img src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png"
+    alt="Get it on F-Droid"
+    height="80">](https://f-droid.org/packages/dev.imranr.obtainium.fdroid/)
      
 [PGP Public Key](https://keyserver.ubuntu.com/pks/lookup?search=contact%40imranr.dev&fingerprint=on&op=index)
 

android/app/src/main/AndroidManifest.xml

@@ -70,8 +70,6 @@
     <uses-permission android:name="android.permission.REQUEST_DELETE_PACKAGES" />
     <uses-permission
         android:name="android.permission.WRITE_EXTERNAL_STORAGE"
-        android:maxSdkVersion="29" />
+        android:maxSdkVersion="29" />\
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"
-        tools:node="remove" />
     <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES" />
 </manifest>

assets/translations/bs.json

@@ -80,7 +80,6 @@
     "removeOutdatedFilter": "Uklonite zastarjeli filter aplikacija",
     "showOutdatedOnly": "Prikaži samo zastarjele aplikacije",
     "filter": "Filtriranje",
-    "filterActive": "Filtriranje",
     "filterApps": "Filtriraj aplikacije",
     "appName": "Naziv aplikacije",
     "author": "Autor",
@@ -352,5 +351,9 @@
     "xAndNMoreUpdatesPossiblyInstalled": {
         "one": "{} i još jedna aplikacija je vjerovatno ažurirana.",
         "other": "{} i još {} aplikacija su vjerovatno ažurirane."
+    },
+    "apk": {
+        "one": "{} APK",
+        "other": "{} APKs"
     }
 }

assets/translations/cs.json

@@ -80,7 +80,6 @@
     "removeOutdatedFilter": "Odstranit filtr Neaktuální",
     "showOutdatedOnly": "Zobrazovat pouze zastaralé aplikace",
     "filter": "Filtr",
-    "filterActive": "Filtr *",
     "filterApps": "Filtrovat aplikace",
     "appName": "Název aplikace",
     "author": "Autor",
@@ -352,5 +351,9 @@
     "xAndNMoreUpdatesPossiblyInstalled": {
         "one": "{} a 1 další aplikace možno aktualizovat",
         "other": "{} a {} další aplikace mohou být aktualizovány."
+    },
+    "apk": {
+        "one": "{} APK",
+        "other": "{} APK"
     }
 }

assets/translations/de.json

@@ -80,7 +80,6 @@
     "removeOutdatedFilter": "App-Filter ‚Nicht aktuell‘ entfernen",
     "showOutdatedOnly": "Nur nicht aktuelle Apps anzeigen",
     "filter": "Filter",
-    "filterActive": "Filter *",
     "filterApps": "Apps filtern",
     "appName": "App Name",
     "author": "Autor",
@@ -352,5 +351,9 @@
     "xAndNMoreUpdatesPossiblyInstalled": {
         "one": "{} und 1 weitere Anwendung wurden möglicherweise aktualisiert.",
         "other": "{} und {} weitere Anwendungen wurden möglicherweise aktualisiert."
+    },
+    "apk": {
+        "one": "{} APK",
+        "other": "{} APKs"
     }
 }

assets/translations/en.json

@@ -351,5 +351,9 @@
     "xAndNMoreUpdatesPossiblyInstalled": {
         "one": "{} and 1 more app may have been updated.",
         "other": "{} and {} more apps may have been updated."
+    },
+    "apk": {
+        "one": "{} APK",
+        "other": "{} APKs"
     }
 }

assets/translations/es.json

@@ -80,7 +80,6 @@
     "removeOutdatedFilter": "Elimiar filtro de aplicaciones desactualizado",
     "showOutdatedOnly": "Mostrar solo aplicaciones desactualizadas",
     "filter": "Filtrar",
-    "filterActive": "Filtrar *",
     "filterApps": "Filtrar Actualizaciones",
     "appName": "Nombre de la aplicación",
     "author": "Autor",
@@ -352,5 +351,9 @@
     "xAndNMoreUpdatesPossiblyInstalled": {
         "one": "{} y 1 aplicación más podría haber sido actualizada.",
         "other": "{} y {} aplicaciones más podrían haber sido actualizadas."
+    },
+    "apk": {
+        "one": "{} APK",
+        "other": "{} APKs"
     }
 }

assets/translations/fa.json

@@ -80,7 +80,6 @@
     "removeOutdatedFilter": "فیلتر برنامه قدیمی را حذف کنید",
     "showOutdatedOnly": "فقط برنامه های قدیمی را نشان دهید",
     "filter": "فیلتر",
-    "filterActive": "فیلتر *",
     "filterApps": "فیلتر کردن برنامه ها",
     "appName": "نام برنامه",
     "author": "سازنده",
@@ -352,5 +351,9 @@
     "xAndNMoreUpdatesPossiblyInstalled": {
         "one": "{} و 1 برنامه دیگر ممکن است به روز شده باشند.",
         "other": "ممکن است {} و {} برنامه های دیگر به روز شده باشند."
+    },
+    "apk": {
+        "one": "{} APK",
+        "other": "{} APKs"
     }
 }

assets/translations/fr.json

@@ -80,7 +80,6 @@
     "removeOutdatedFilter": "Supprimer le filtre d'application obsolète",
     "showOutdatedOnly": "Afficher uniquement les applications obsolètes",
     "filter": "Filtre",
-    "filterActive": "Filtre *",
     "filterApps": "Filtrer les applications",
     "appName": "Nom de l'application",
     "author": "Auteur",
@@ -352,5 +351,9 @@
     "xAndNMoreUpdatesPossiblyInstalled": {
         "une": "{} et 1 application supplémentaire ont peut-être été mises à jour.",
         "other": "{} et {} autres applications peuvent avoir été mises à jour."
+    },
+    "apk": {
+        "one": "{} APK",
+        "other": "{} APKs"
     }
 }

assets/translations/hu.json

@@ -80,7 +80,6 @@
     "removeOutdatedFilter": "Távolítsa el az elavult app szűrőt",
     "showOutdatedOnly": "Csak az elavult appok megjelenítése",
     "filter": "Szűrő",
-    "filterActive": "Szűrő *",
     "filterApps": "Appok szűrése",
     "appName": "App név",
     "author": "Szerző",
@@ -303,7 +302,7 @@
     "badDownload": "Az APK-t nem lehetett elemezni (inkompatibilis vagy részleges letöltés)",
     "removeAppQuestion": {
         "one": "Eltávolítja az alkalmazást?",
-        "other": "Eltávolítja az alkalmazást?"
+        "other": "Eltávolítja az alkalmazásokat?"
     },
     "tooManyRequestsTryAgainInMinutes": {
         "one": "Túl sok kérés (korlátozott arány) – próbálja újra {} perc múlva",
@@ -352,5 +351,9 @@
     "xAndNMoreUpdatesPossiblyInstalled": {
         "one": "{} és 1 további alkalmazás is frissült.",
         "other": "{} és {} további alkalmazás is frissült."
+    },
+    "apk": {
+        "one": "{} APK",
+        "other": "{} APK-k"
     }
 }

assets/translations/it.json

@@ -80,7 +80,6 @@
     "removeOutdatedFilter": "Rimuovi il filtro per le app non aggiornate",
     "showOutdatedOnly": "Mostra solo le app non aggiornate",
     "filter": "Filtri",
-    "filterActive": "Filtri *",
     "filterApps": "Filtra app",
     "appName": "Nome dell'app",
     "author": "Autore",
@@ -352,5 +351,9 @@
     "xAndNMoreUpdatesPossiblyInstalled": {
         "one": "{} e un'altra app potrebbero essere state aggiornate.",
         "other": "{} e altre {} app potrebbero essere state aggiornate."
+    },
+    "apk": {
+        "one": "{} APK",
+        "other": "{} APK"
     }
 }

assets/translations/ja.json

@@ -80,7 +80,6 @@
     "removeOutdatedFilter": "アップデートが存在するアプリのフィルターを解除",
     "showOutdatedOnly": "アップデートが存在するアプリのみ表示する",
     "filter": "フィルター",
-    "filterActive": "フィルター *",
     "filterApps": "アプリをフィルタリングする",
     "appName": "アプリ名",
     "author": "作者",
@@ -352,5 +351,9 @@
     "xAndNMoreUpdatesPossiblyInstalled": {
         "one": "{} とさらに 1 個のアプリがアップデートされた可能性があります。",
         "other": "{} とさらに {} 個のアプリがアップデートされた可能性があります。"
+    },
+    "apk": {
+        "one": "{}APK",
+        "other": "{}APK"
     }
 }

assets/translations/nl.json

@@ -80,7 +80,6 @@
     "removeOutdatedFilter": "Verwijder out-of-date app filter",
     "showOutdatedOnly": "Toon alleen out-of-date apps",
     "filter": "Filter",
-    "filterActive": "Filteren *",
     "filterApps": "Filter apps",
     "appName": "App naam",
     "author": "Auteur",
@@ -352,5 +351,9 @@
     "xAndNMoreUpdatesPossiblyInstalled": {
         "one": "{} en nog 1 app zijn mogelijk bijgewerkt.",
         "other": "{} en {} meer apps zijn mogelijk bijgwerkt."
+    },
+    "apk": {
+        "one": "{} APK",
+        "other": "{} APK's"
     }
 }

assets/translations/pl.json

@@ -80,7 +80,6 @@
     "removeOutdatedFilter": "Usuń filtr nieaktualnych aplikacji",
     "showOutdatedOnly": "Pokaż tylko nieaktualne aplikacje",
     "filter": "FIltr",
-    "filterActive": "Filtruj *",
     "filterApps": "Filtruj aplikacje",
     "appName": "Nazwa aplikacji",
     "author": "Autor",
@@ -378,5 +377,9 @@
         "few": "{} i {} inne apki mogły zostać zaktualizowane.",
         "many": "{} i {} innych apek mogło zostać zaktualizowanych.",
         "other": "{} i {} inne apki mogły zostać zaktualizowane."
+    },
+    "apk": {
+        "one": "{} APK",
+        "other": "{} APK"
     }
 }

assets/translations/pt.json

@@ -80,7 +80,6 @@
     "removeOutdatedFilter": "Remover filtro de aplicativos desatualizados",
     "showOutdatedOnly": "Mostrar apenas aplicativos desatualizados",
     "filter": "Filtro",
-    "filterActive": "Filtro *",
     "filterApps": "Filtrar aplicativos",
     "appName": "Nome do aplicativo",
     "author": "Autor",
@@ -352,5 +351,9 @@
     "xAndNMoreUpdatesPossiblyInstalled": {
         "one": "{} e um outro aplicativo podem ter sido atualizados.",
         "other": "{} e {} outros aplicativos podem ter sido atualizados."
+    },
+    "apk": {
+        "one": "{} APK",
+        "other": "{} APKs"
     }
 }

assets/translations/ru.json

@@ -80,7 +80,6 @@
     "removeOutdatedFilter": "Удалить фильтр для устаревших приложений",
     "showOutdatedOnly": "Показывать только устаревшие приложения",
     "filter": "Фильтр",
-    "filterActive": "Фильтр *",
     "filterApps": "Фильтровать приложения",
     "appName": "Название приложения",
     "author": "Автор",
@@ -352,5 +351,9 @@
     "xAndNMoreUpdatesPossiblyInstalled": {
         "one": "{} и ещё 1 приложение могли быть обновлены",
         "other": "{} и ещё {} приложений могли быть обновлены"
+    },
+    "apk": {
+        "one": "{} APK",
+        "other": "{} APKs"
     }
 }

assets/translations/standardize.js

@@ -58,11 +58,10 @@ const main = async () => {
         return `${translationsDir}/${f}`
     }).filter(f => f.endsWith('.json') && f != templateFile)
 
-    const templateTranslation = require(templateFile)
+    const templateTranslation = JSON.parse(fs.readFileSync(templateFile).toString())
-
 
     otherFiles.forEach(file => {
-        const thisTranslationOriginal = require(file)
+        const thisTranslationOriginal = JSON.parse(fs.readFileSync((file).toString()))
         const thisTranslationNew = {}
         Object.keys(templateTranslation).forEach(k => {
             thisTranslationNew[k] = thisTranslationOriginal[k] || templateTranslation[k]
@@ -72,7 +71,7 @@ const main = async () => {
 
     for (let i in otherFiles) {
         const file = otherFiles[i]
-        const thisTranslation = require(file)
+        const thisTranslation = JSON.parse(fs.readFileSync((file).toString()))
         const translationKeys = Object.keys(templateTranslation)
         for (let j in translationKeys) {
             const k = translationKeys[j]

assets/translations/sv.json

@@ -80,7 +80,6 @@
     "removeOutdatedFilter": "Ta bort Utgånga App-filtret",
     "showOutdatedOnly": "Visa Endast Utgånga Appar",
     "filter": "Filtrera",
-    "filterActive": "Filter *",
     "filterApps": "Filtrera Appar",
     "appName": "Appnamn",
     "author": "Utvecklare",
@@ -352,5 +351,9 @@
     "xAndNMoreUpdatesPossiblyInstalled": {
         "one": "{} och 1 till app kan ha uppdaterats.",
         "other": "{} och {} appar till kan ha uppdaterats."
+    },
+    "apk": {
+        "one": "{} APK",
+        "other": "{} APK:er"
     }
 }

assets/translations/tr.json

@@ -80,7 +80,6 @@
     "removeOutdatedFilter": "Güncel Olmayan Uygulama Filtresini Kaldır",
     "showOutdatedOnly": "Yalnızca Güncel Olmayan Uygulamaları Göster",
     "filter": "Filtre",
-    "filterActive": "Filtre *",
     "filterApps": "Uygulamaları Filtrele",
     "appName": "Uygulama Adı",
     "author": "Yazar",
@@ -352,5 +351,9 @@
     "xAndNMoreUpdatesPossiblyInstalled": {
         "one": "{} ve 1 diğer uygulama muhtemelen güncellendi.",
         "other": "{} ve {} daha fazla uygulama muhtemelen güncellendi."
+    },
+    "apk": {
+        "one": "{} APK",
+        "other": "{} APK'lar"
     }
 }

assets/translations/vi.json

@@ -72,7 +72,7 @@
     "unpinFromTop": "Bỏ ghim khỏi đầu trang",
     "resetInstallStatusForSelectedAppsQuestion": "Đặt lại trạng thái cài đặt cho ứng dụng đã chọn?",
     "installStatusOfXWillBeResetExplanation": "Trạng thái cài đặt của mọi Ứng dụng đã chọn sẽ được đặt lại.\n\nĐiều này có thể hữu ích khi phiên bản Ứng dụng hiển thị trong Obtainium không chính xác do cập nhật không thành công hoặc các sự cố khác.",
-    "customLinkMessage": "Các liên kết này hoạt động trên các thiết bị có cài đặt Gainium",
+    "customLinkMessage": "Các liên kết này hoạt động trên các thiết bị có cài đặt Obtainium",
     "shareAppConfigLinks": "Chia sẻ cấu hình ứng dụng dưới dạng liên kết HTML",
     "shareSelectedAppURLs": "Chia sẻ URL ứng dụng đã chọn",
     "resetInstallStatus": "Đặt lại trạng thái cài đặt",
@@ -80,14 +80,13 @@
     "removeOutdatedFilter": "Xóa bộ lọc ứng dụng lỗi thời",
     "showOutdatedOnly": "Chỉ hiển thị các ứng dụng lỗi thời",
     "filter": "Lọc",
-    "filterActive": "Lọc *",
     "filterApps": "Lọc ứng dụng",
     "appName": "Tên ứng dụng",
     "author": "Tác giả",
     "upToDateApps": "Ứng dụng cập nhật",
     "nonInstalledApps": "Ứng dụng chưa được cài đặt",
     "importExport": "Nhập/Xuất",
-    "settings": "Cài đặt",
+    "settings": "Thiết đặt",
     "exportedTo": "Đã xuất sang {}",
     "obtainiumExport": "Xuất",
     "invalidInput": "Đầu vào không hợp lệ",
@@ -132,7 +131,7 @@
     "close": "Đóng",
     "share": "Chia sẻ",
     "appNotFound": "Không tìm thấy ứng dụng",
-    "obtainiumExportHyphenatedLowercase": "xuất khẩu-obtainium",
+    "obtainiumExportHyphenatedLowercase": "obtainium-export",
     "pickAnAPK": "Chọn một APK",
     "appHasMoreThanOnePackage": "{} có nhiều gói:",
     "deviceSupportsXArch": "Thiết bị của bạn hỗ trợ kiến trúc CPU {}.",
@@ -168,7 +167,7 @@
     "lastUpdateCheckX": "Kiểm tra cập nhật lần cuối: {}",
     "remove": "Loại bỏ",
     "yesMarkUpdated": "Có, Đánh dấu là đã cập nhật",
-    "fdroid": "Chính thức của F-Droid",
+    "fdroid": "F-Droid Chính thức",
     "appIdOrName": "ID hoặc tên ứng dụng",
     "appId": "ID ứng dụng",
     "appWithIdOrNameNotFound": "Không tìm thấy ứng dụng nào có ID hoặc tên đó",
@@ -188,18 +187,18 @@
     "noAPKFound": "Không tìm thấy APK",
     "noVersionDetection": "Không phát hiện phiên bản",
     "categorize": "Phân loại",
-    "categories": "Thể loại",
+    "categories": "Danh mục",
-    "category": "Thể loại",
+    "category": "Danh mục",
-    "noCategory": "Không thể loại",
+    "noCategory": "Không danh mục",
-    "noCategories": "Không thể loại",
+    "noCategories": "Không danh mục",
-    "deleteCategoriesQuestion": "Xóa thể loại?",
+    "deleteCategoriesQuestion": "Xóa danh mục?",
-    "categoryDeleteWarning": "Tất cả ứng dụng trong thể loại đã xóa sẽ được đặt thành chưa được phân loại.",
+    "categoryDeleteWarning": "Tất cả ứng dụng trong danh mục đã xóa sẽ được đặt thành chưa được phân loại.",
     "addCategory": "Thêm thể loại",
     "label": "Nhãn",
     "language": "Ngôn ngữ",
     "copiedToClipboard": "Sao chép vào clipboard",
     "storagePermissionDenied": "Quyền lưu trữ bị từ chối",
-    "selectedCategorizeWarning": "Điều này sẽ thay thế mọi cài đặt thể loại hiện có cho Ứng dụng đã chọn.",
+    "selectedCategorizeWarning": "Điều này sẽ thay thế mọi thiết đặt danh mục hiện có cho Ứng dụng đã chọn.",
     "filterAPKsByRegEx": "Lọc APK theo biểu thức chính quy",
     "removeFromObtainium": "Loại khỏi Obtainium",
     "uninstallFromDevice": "Gỡ cài đặt khỏi thiết bị",
@@ -212,7 +211,7 @@
     "versionDetectionExplanation": "Đối chiếu chuỗi phiên bản với phiên bản được phát hiện từ hệ điều hành",
     "versionDetection": "Phát hiện phiên bản",
     "standardVersionDetection": "Phát hiện phiên bản tiêu chuẩn",
-    "groupByCategory": "Nhóm theo thể loại",
+    "groupByCategory": "Nhóm theo danh mục",
     "autoApkFilterByArch": "Cố gắng lọc APK theo kiến trúc CPU nếu có thể",
     "overrideSource": "Ghi đè nguồn",
     "dontShowAgain": "Đừng hiển thị thông tin này nữa",
@@ -221,7 +220,7 @@
     "moveNonInstalledAppsToBottom": "Chuyển Ứng dụng chưa được cài đặt xuống cuối danh sách",
     "gitlabPATLabel": "GitLab Token\n(Cho phép tìm kiếm và lọc APK tốt hơn)",
     "about": "Giới thiệu",
-    "requiresCredentialsInSettings": "{}: Điều này cần thông tin xác thực bổ sung (trong Cài đặt)",
+    "requiresCredentialsInSettings": "{}: Điều này cần thông tin xác thực bổ sung (trong Thiết đặt)",
     "checkOnStart": "Kiểm tra các bản cập nhật khi khởi động",
     "tryInferAppIdFromCode": "Thử suy ra ID ứng dụng từ mã nguồn",
     "removeOnExternalUninstall": "Tự động xóa ứng dụng đã gỡ cài đặt bên ngoài",
@@ -231,7 +230,7 @@
     "reversePageTransitions": "Hoạt ảnh chuyển đổi trang đảo ngược",
     "minStarCount": "Số lượng sao tối thiểu",
     "addInfoBelow": "Thêm thông tin này vào bên dưới.",
-    "addInfoInSettings": "Thêm thông tin này vào Cài đặt.",
+    "addInfoInSettings": "Thêm thông tin này vào Thiết đặt.",
     "githubSourceNote": "Có thể tránh được việc giới hạn tốc độ GitHub bằng cách sử dụng khóa API.",
     "gitlabSourceNote": "Trích xuất APK GitLab có thể không hoạt động nếu không có khóa API.",
     "sortByLastLinkSegment": "Chỉ sắp xếp theo đoạn cuối của liên kết",
@@ -256,7 +255,7 @@
     "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",
     "autoExportOnChanges": "Tự động xuất",
-    "includeSettings": "Bao gồm cài đặt ứng dụng",
+    "includeSettings": "Bao gồm thiết đặt",
     "filterVersionsByRegEx": "Lọc phiên bản theo biểu thức chính quy",
     "trySelectingSuggestedVersionCode": "Thử chọn APK Mã phiên bản được đề xuất",
     "dontSortReleasesList": "Giữ lại thứ tự phát hành từ API",
@@ -298,9 +297,9 @@
     "installed": "Đã cài đặt",
     "latest": "Mới nhất",
     "invertRegEx": "Đảo ngược biểu thức chính quy",
-    "note": "Note",
+    "note": "Ghi chú",
-    "selfHostedNote": "The \"{}\" dropdown can be used to reach self-hosted/custom instances of any source.",
+    "selfHostedNote": "Trình đơn thả xuống \"{}\" có thể được dùng để tiếp cận các phiên bản tự lưu trữ/tùy chỉnh của bất kỳ nguồn nào.",
-    "badDownload": "The APK could not be parsed (incompatible or partial download)",
+    "badDownload": "Không thể phân tích cú pháp APK (tải xuống một phần hoặc không tương thích)",
     "removeAppQuestion": {
         "one": "Gỡ ứng dụng?",
         "other": "Gỡ ứng dụng?"
@@ -352,5 +351,9 @@
     "xAndNMoreUpdatesPossiblyInstalled": {
         "one": "{} và 1 ứng dụng khác có thể đã được cập nhật.",
         "other": "{} và {} ứng dụng khác có thể đã được cập nhật."
+    },
+    "apk": {
+        "one": "{} APK",
+        "other": "{} APKs"
     }
 }

assets/translations/zh.json

@@ -80,7 +80,6 @@
     "removeOutdatedFilter": "删除失效的应用筛选",
     "showOutdatedOnly": "只显示待更新应用",
     "filter": "筛选",
-    "filterActive": "筛选 *",
     "filterApps": "筛选应用",
     "appName": "应用名称",
     "author": "作者",
@@ -352,5 +351,9 @@
     "xAndNMoreUpdatesPossiblyInstalled": {
         "one": "{} 和另外 1 个应用已尝试更新。",
         "other": "“{}”和另外 {} 个应用已尝试更新。"
+    },
+    "apk": {
+        "one": "{}APK",
+        "other": "{}APK"
     }
 }

lib/app_sources/fdroid.dart

@@ -76,16 +76,7 @@ class FDroid extends AppSource {
         'https://$host/repo/$appId',
         standardUrl,
         name,
-        autoSelectHighestVersionCode:
+        additionalSettings: additionalSettings);
-            additionalSettings['autoSelectHighestVersionCode'] == true,
-        trySelectingSuggestedVersionCode:
-            additionalSettings['trySelectingSuggestedVersionCode'] == true,
-        filterVersionsByRegEx:
-            (additionalSettings['filterVersionsByRegEx'] as String?)
-                        ?.isNotEmpty ==
-                    true
-                ? additionalSettings['filterVersionsByRegEx']
-                : null);
     if (!hostChanged) {
       try {
         var res = await sourceRequest(
@@ -166,12 +157,30 @@ class FDroid extends AppSource {
 
   APKDetails getAPKUrlsFromFDroidPackagesAPIResponse(
       Response res, String apkUrlPrefix, String standardUrl, String sourceName,
-      {bool autoSelectHighestVersionCode = false,
+      {Map<String, dynamic> additionalSettings = const {}}) {
-      bool trySelectingSuggestedVersionCode = false,
+    var autoSelectHighestVersionCode =
-      String? filterVersionsByRegEx}) {
+        additionalSettings['autoSelectHighestVersionCode'] == true;
+    var trySelectingSuggestedVersionCode =
+        additionalSettings['trySelectingSuggestedVersionCode'] == true;
+    var filterVersionsByRegEx =
+        (additionalSettings['filterVersionsByRegEx'] as String?)?.isNotEmpty ==
+                true
+            ? additionalSettings['filterVersionsByRegEx']
+            : null;
+    var apkFilterRegEx =
+        (additionalSettings['apkFilterRegEx'] as String?)?.isNotEmpty == true
+            ? additionalSettings['apkFilterRegEx']
+            : null;
     if (res.statusCode == 200) {
       var response = jsonDecode(res.body);
       List<dynamic> releases = response['packages'] ?? [];
+      if (apkFilterRegEx != null) {
+        releases = releases.where((rel) {
+          String apk = '${apkUrlPrefix}_${rel['versionCode']}.apk';
+          return filterApks([MapEntry(apk, apk)], apkFilterRegEx, false)
+              .isNotEmpty;
+        }).toList();
+      }
       if (releases.isEmpty) {
         throw NoReleasesError();
       }

lib/app_sources/fdroidrepo.dart

@@ -1,5 +1,6 @@
 import 'package:easy_localization/easy_localization.dart';
 import 'package:html/parser.dart';
+import 'package:http/http.dart';
 import 'package:obtainium/components/generated_form.dart';
 import 'package:obtainium/custom_errors.dart';
 import 'package:obtainium/providers/source_provider.dart';
@@ -45,7 +46,7 @@ class FDroidRepo extends AppSource {
   String sourceSpecificStandardizeURL(String url) {
     var standardUri = Uri.parse(url);
     var pathSegments = standardUri.pathSegments;
-    if (pathSegments.last == 'index.xml') {
+    if (pathSegments.isNotEmpty && pathSegments.last == 'index.xml') {
       pathSegments.removeLast();
       standardUri = standardUri.replace(path: pathSegments.join('/'));
     }
@@ -60,7 +61,7 @@ class FDroidRepo extends AppSource {
       throw NoReleasesError();
     }
     url = removeQueryParamsFromUrl(standardizeUrl(url));
-    var res = await sourceRequest('$url/index.xml', {});
+    var res = await sourceRequestWithURLVariants(url, {});
     if (res.statusCode == 200) {
       var body = parse(res.body);
       Map<String, List<String>> results = {};
@@ -72,7 +73,11 @@ class FDroidRepo extends AppSource {
             appId.contains(query) ||
             appName.contains(query) ||
             appDesc.contains(query)) {
-          results['$url?appId=$appId'] = [appName, appDesc];
+          results[
+              '${res.request!.url.toString().split('/').reversed.toList().sublist(1).reversed.join('/')}?appId=$appId'] = [
+            appName,
+            appDesc
+          ];
         }
       });
       return results;
@@ -102,6 +107,26 @@ class FDroidRepo extends AppSource {
     return app;
   }
 
+  Future<Response> sourceRequestWithURLVariants(
+    String url,
+    Map<String, dynamic> additionalSettings,
+  ) async {
+    var res = await sourceRequest(
+        '$url${url.endsWith('/index.xml') ? '' : '/index.xml'}',
+        additionalSettings);
+    if (res.statusCode != 200) {
+      var base = url.endsWith('/index.xml')
+          ? url.split('/').reversed.toList().sublist(1).reversed.join('/')
+          : url;
+      res = await sourceRequest('$base/repo/index.xml', additionalSettings);
+      if (res.statusCode != 200) {
+        res = await sourceRequest(
+            '$base/fdroid/repo/index.xml', additionalSettings);
+      }
+    }
+    return res;
+  }
+
   @override
   Future<APKDetails> getLatestAPKDetails(
     String standardUrl,
@@ -117,9 +142,8 @@ class FDroidRepo extends AppSource {
     if (appIdOrName == null) {
       throw NoReleasesError();
     }
-    var res = await sourceRequest(
+    var res =
-        '$standardUrl${standardUrl.endsWith('/index.xml') ? '' : '/index.xml'}',
+        await sourceRequestWithURLVariants(standardUrl, additionalSettings);
-        additionalSettings);
     if (res.statusCode == 200) {
       var body = parse(res.body);
       var foundApps = body.querySelectorAll('application').where((element) {
@@ -168,7 +192,8 @@ class FDroidRepo extends AppSource {
         latestVersionReleases = [latestVersionReleases[0]];
       }
       List<String> apkUrls = latestVersionReleases
-          .map((e) => '$standardUrl/${e.querySelector('apkname')!.innerHtml}')
+          .map((e) =>
+              '${res.request!.url.toString().split('/').reversed.toList().sublist(1).reversed.join('/')}/${e.querySelector('apkname')!.innerHtml}')
           .toList();
       return APKDetails(latestVersion, getApkUrlsFromUrls(apkUrls),
           AppNames(authorName, appName),

lib/app_sources/github.dart

@@ -400,7 +400,7 @@ class GitHub extends AppSource {
       if (version == null) {
         throw NoVersionError();
       }
-      var changeLog = targetRelease['body'].toString();
+      var changeLog = (targetRelease['body'] ?? '').toString();
       return APKDetails(
           version,
           targetRelease['apkUrls'] as List<MapEntry<String, String>>,

lib/app_sources/gitlab.dart

@@ -1,4 +1,5 @@
 import 'dart:convert';
+import 'dart:io';
 
 import 'package:flutter/material.dart';
 import 'package:html/parser.dart';
@@ -104,6 +105,21 @@ class GitLab extends AppSource {
   String? changeLogPageFromStandardUrl(String standardUrl) =>
       '$standardUrl/-/releases';
 
+  @override
+  Future<Map<String, String>?> getRequestHeaders(
+      Map<String, dynamic> additionalSettings,
+      {bool forAPKDownload = false}) async {
+    // Change headers to pacify, e.g. cloudflare protection
+    // Related to: (#1397, #1389, #1384, #1382, #1381, #1380, #1359, #854, #785, #697)
+    var headers = <String, String>{};
+    headers[HttpHeaders.refererHeader] = 'https://${hosts[0]}';
+    if (headers.isNotEmpty) {
+      return headers;
+    } else {
+      return null;
+    }
+  }
+
   @override
   Future<APKDetails> getLatestAPKDetails(
     String standardUrl,

lib/app_sources/izzyondroid.dart

@@ -50,10 +50,6 @@ class IzzyOnDroid extends AppSource {
         'https://android.izzysoft.de/frepo/$appId',
         standardUrl,
         name,
-        autoSelectHighestVersionCode:
+        additionalSettings: additionalSettings);
-            additionalSettings['autoSelectHighestVersionCode'] == true,
-        trySelectingSuggestedVersionCode:
-            additionalSettings['trySelectingSuggestedVersionCode'] == true,
-        filterVersionsByRegEx: additionalSettings['filterVersionsByRegEx']);
   }
 }

lib/pages/add_app.dart

@@ -1,7 +1,6 @@
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
-import 'package:obtainium/app_sources/html.dart';
 import 'package:obtainium/components/custom_app_bar.dart';
 import 'package:obtainium/components/generated_form.dart';
 import 'package:obtainium/components/generated_form_modal.dart';
@@ -62,18 +61,6 @@ class AddAppPageState extends State<AddAppPage> {
         var prevHost = pickedSource?.hosts.isNotEmpty == true
             ? pickedSource?.hosts[0]
             : null;
-        try {
-          var naturalSource =
-              valid ? sourceProvider.getSource(userInput) : null;
-          if (naturalSource != null &&
-              naturalSource.runtimeType.toString() !=
-                  HTML().runtimeType.toString()) {
-            // If input has changed to match a regular source, reset the override
-            pickedSourceOverride = null;
-          }
-        } catch (e) {
-          // ignore
-        }
         var source = valid
             ? sourceProvider.getSource(userInput,
                 overrideSource: pickedSourceOverride)
@@ -163,7 +150,7 @@ class AddAppPageState extends State<AddAppPage> {
           app = await sourceProvider.getApp(
               pickedSource!, userInput.trim(), additionalSettings,
               trackOnlyOverride: trackOnly,
-              overrideSource: pickedSourceOverride,
+              sourceIsOverriden: pickedSourceOverride != null,
               inferAppIdIfOptional: inferAppIdIfOptional);
           // Only download the APK here if you need to for the package ID
           if (isTempId(app) && app.additionalSettings['trackOnly'] != true) {
@@ -361,8 +348,9 @@ class AddAppPageState extends State<AddAppPage> {
                   [
                     GeneratedFormDropdown(
                         'overrideSource',
-                        defaultValue: HTML().runtimeType.toString(),
+                        defaultValue: '',
                         [
+                          MapEntry('', tr('none')),
                           ...sourceProvider.sources.map(
                               (s) => MapEntry(s.runtimeType.toString(), s.name))
                         ],
@@ -577,11 +565,7 @@ class AddAppPageState extends State<AddAppPage> {
                       const SizedBox(
                         height: 16,
                       ),
-                      if (pickedSourceOverride != null ||
+                      if (pickedSource != null) getHTMLSourceOverrideDropdown(),
-                          (pickedSource != null &&
-                              pickedSource.runtimeType.toString() ==
-                                  HTML().runtimeType.toString()))
-                        getHTMLSourceOverrideDropdown(),
                       if (shouldShowSearchBar()) getSearchBarRow(),
                       if (pickedSource != null)
                         FutureBuilder(

lib/pages/app.dart

@@ -104,6 +104,10 @@ class _AppPageState extends State<AppPage> {
       if (installedVersionIsEstimate) {
         infoLines = '${tr('pseudoVersionInUse')}\n$infoLines';
       }
+      if ((app?.app.apkUrls.length ?? 0) > 0) {
+        infoLines =
+            '$infoLines\n${app?.app.apkUrls.length == 1 ? app?.app.apkUrls[0].key : plural('apk', app?.app.apkUrls.length ?? 0)}';
+      }
       return Column(
         mainAxisAlignment: MainAxisAlignment.center,
         crossAxisAlignment: CrossAxisAlignment.stretch,

lib/pages/import_export.dart

@@ -213,7 +213,7 @@ class _ImportExportPageState extends State<ImportExportPage> {
           setState(() {
             importInProgress = true;
           });
-          if (values['url'] != source.hosts[0]) {
+          if (source.hosts.isEmpty || values['url'] != source.hosts[0]) {
             source = sourceProvider.getSource(values['url'],
                 overrideSource: source.runtimeType.toString());
           }

lib/providers/apps_provider.dart

@@ -717,7 +717,7 @@ class AppsProvider with ChangeNotifier {
     appsToInstall =
         moveStrToEnd(appsToInstall, obtainiumId, strB: obtainiumTempId);
 
-    Future<void> updateFn(String id, {bool skipInstalls = false}) async {
+    Future<String> updateFn(String id, {bool skipInstalls = false}) async {
       try {
         var downloadedArtifact =
             // ignore: use_build_context_synchronously
@@ -730,8 +730,8 @@ class AppsProvider with ChangeNotifier {
         } else {
           downloadedDir = downloadedArtifact as DownloadedXApkDir;
         }
-        var appId = downloadedFile?.appId ?? downloadedDir!.appId;
+        id = downloadedFile?.appId ?? downloadedDir!.appId;
-        bool willBeSilent = await canInstallSilently(apps[appId]!.app);
+        bool willBeSilent = await canInstallSilently(apps[id]!.app);
         switch (settingsProvider.installMethod) {
           case InstallMethodSettings.normal:
             if (!(await settingsProvider.getInstallPermission(
@@ -773,18 +773,19 @@ class AppsProvider with ChangeNotifier {
             }
             if (willBeSilent && context == null) {
               notificationsProvider?.notify(SilentUpdateAttemptNotification(
-                  [apps[appId]!.app],
+                  [apps[id]!.app],
-                  id: appId.hashCode));
+                  id: id.hashCode));
             }
+            installedIds.add(id);
           }
         } finally {
           apps[id]?.downloadProgress = null;
           notifyListeners();
         }
-        installedIds.add(id);
       } catch (e) {
         errors.add(id, e, appName: apps[id]?.name);
       }
+      return id;
     }
 
     if (forceParallelDownloads || !settingsProvider.parallelDownloads) {
@@ -792,9 +793,9 @@ class AppsProvider with ChangeNotifier {
         await updateFn(id);
       }
     } else {
-      await Future.wait(
+      List<String> ids = await Future.wait(
           appsToInstall.map((id) => updateFn(id, skipInstalls: true)));
-      for (var id in appsToInstall) {
+      for (var id in ids) {
         if (!errors.appIdNames.containsKey(id)) {
           await updateFn(id);
         }

lib/providers/settings_provider.dart

@@ -30,8 +30,22 @@ enum SortOrderSettings { ascending, descending }
 
 const maxAPIRateLimitMinutes = 30;
 const minUpdateIntervalMinutes = maxAPIRateLimitMinutes + 30;
-const maxUpdateIntervalMinutes = 4320;
+const maxUpdateIntervalMinutes = 43200;
-List<int> updateIntervals = [15, 30, 60, 120, 180, 360, 720, 1440, 4320, 0]
+List<int> updateIntervals = [
+  15,
+  30,
+  60,
+  120,
+  180,
+  360,
+  720,
+  1440,
+  4320,
+  10080,
+  20160,
+  43200,
+  0
+]
     .where((element) =>
         (element >= minUpdateIntervalMinutes &&
             element <= maxUpdateIntervalMinutes) ||

lib/providers/source_provider.dart

@@ -819,7 +819,7 @@ class SourceProvider {
       AppSource source, String url, Map<String, dynamic> additionalSettings,
       {App? currentApp,
       bool trackOnlyOverride = false,
-      String? overrideSource,
+      bool sourceIsOverriden = false,
       bool inferAppIdIfOptional = false}) async {
     if (trackOnlyOverride || source.enforceTrackOnly) {
       additionalSettings['trackOnly'] = true;
@@ -887,7 +887,9 @@ class SourceProvider {
         categories: currentApp?.categories ?? const [],
         releaseDate: apk.releaseDate,
         changeLog: apk.changeLog,
-        overrideSource: overrideSource ?? currentApp?.overrideSource,
+        overrideSource: sourceIsOverriden
+            ? source.runtimeType.toString()
+            : currentApp?.overrideSource,
         allowIdChange: currentApp?.allowIdChange ??
             trackOnly ||
                 (source.appIdInferIsOptional &&
@@ -911,6 +913,7 @@ class SourceProvider {
         apps.add(await getApp(
             source,
             url,
+            sourceIsOverriden: sourceOverride != null,
             getDefaultValuesFromFormItems(
                 source.combinedAppSpecificSettingFormItems)));
       } catch (e) {

pubspec.lock

@@ -70,10 +70,10 @@ packages:
     dependency: "direct main"
     description:
       name: background_fetch
-      sha256: "34550cf9b383e5a1844e7d22119aa500508c7df9421fa967c9fb4430d6cb2878"
+      sha256: "1a7868d9bd165eb177f039ff8244cfa7952340b18f7caabf322b26e712b438a3"
       url: "https://pub.dev"
     source: hosted
-    version: "1.2.2"
+    version: "1.2.3"
   boolean_selector:
     dependency: transitive
     description:
@@ -150,10 +150,10 @@ packages:
     dependency: transitive
     description:
       name: cross_file
-      sha256: fedaadfa3a6996f75211d835aaeb8fede285dae94262485698afd832371b9a5e
+      sha256: "55d7b444feb71301ef6b8838dbc1ae02e63dd48c8773f3810ff53bb1e2945b32"
       url: "https://pub.dev"
     source: hosted
-    version: "0.3.3+8"
+    version: "0.3.4+1"
   crypto:
     dependency: "direct main"
     description:
@@ -206,18 +206,18 @@ packages:
     dependency: "direct main"
     description:
       name: dynamic_color
-      sha256: a866f1f8947bfdaf674d7928e769eac7230388a2e7a2542824fad4bb5b87be3b
+      sha256: eae98052fa6e2826bdac3dd2e921c6ce2903be15c6b7f8b6d8a5d49b5086298d
       url: "https://pub.dev"
     source: hosted
-    version: "1.6.9"
+    version: "1.7.0"
   easy_localization:
     dependency: "direct main"
     description:
       name: easy_localization
-      sha256: de63e3b422adfc97f256cbb3f8cf12739b6a4993d390f3cadb3f51837afaefe5
+      sha256: c145aeb6584aedc7c862ab8c737c3277788f47488bfdf9bae0fe112bd0a4789c
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.3"
+    version: "3.0.5"
   easy_logger:
     dependency: transitive
     description:
@@ -238,10 +238,10 @@ packages:
     dependency: transitive
     description:
       name: ffi
-      sha256: "7bf0adc28a23d395f19f3f1eb21dd7cfd1dd9f8e1c50051c069122e6853bc878"
+      sha256: "493f37e7df1804778ff3a53bd691d8692ddf69702cf4c1c1096a2e41b4779e21"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.0"
+    version: "2.1.2"
   file:
     dependency: transitive
     description:
@@ -336,10 +336,10 @@ packages:
     dependency: "direct main"
     description:
       name: flutter_markdown
-      sha256: "30088ce826b5b9cfbf9e8bece34c716c8a59fa54461dcae1e4ac01a94639e762"
+      sha256: a64c5323ac83ed2b7940d2b6288d160aa1753ff271ba9d9b2a86770414aa3eab
       url: "https://pub.dev"
     source: hosted
-    version: "0.6.18+3"
+    version: "0.6.20+1"
   flutter_plugin_android_lifecycle:
     dependency: transitive
     description:
@@ -394,10 +394,10 @@ packages:
     dependency: "direct main"
     description:
       name: http
-      sha256: a2bbf9d017fcced29139daa8ed2bba4ece450ab222871df93ca9eec6f80c34ba
+      sha256: "761a297c042deedc1ffbb156d6e2af13886bb305c2a343a4d972504cd67dd938"
       url: "https://pub.dev"
     source: hosted
-    version: "1.2.0"
+    version: "1.2.1"
   http_parser:
     dependency: transitive
     description:
@@ -410,10 +410,10 @@ packages:
     dependency: transitive
     description:
       name: image
-      sha256: "49a0d4b0c12402853d3f227fe7c315601b238d126aa4caa5dbb2dcf99421aa4a"
+      sha256: "4c68bfd5ae83e700b5204c1e74451e7bf3cf750e6843c6e158289cf56bda018e"
       url: "https://pub.dev"
     source: hosted
-    version: "4.1.6"
+    version: "4.1.7"
   intl:
     dependency: transitive
     description:
@@ -438,6 +438,30 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "4.8.1"
+  leak_tracker:
+    dependency: transitive
+    description:
+      name: leak_tracker
+      sha256: "78eb209deea09858f5269f5a5b02be4049535f568c07b275096836f01ea323fa"
+      url: "https://pub.dev"
+    source: hosted
+    version: "10.0.0"
+  leak_tracker_flutter_testing:
+    dependency: transitive
+    description:
+      name: leak_tracker_flutter_testing
+      sha256: b46c5e37c19120a8a01918cfaf293547f47269f7cb4b0058f21531c2465d6ef0
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.1"
+  leak_tracker_testing:
+    dependency: transitive
+    description:
+      name: leak_tracker_testing
+      sha256: a597f72a664dbd293f3bfc51f9ba69816f84dcd403cdac7066cb3f6003f3ab47
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.1"
   lints:
     dependency: transitive
     description:
@@ -458,26 +482,26 @@ packages:
     dependency: transitive
     description:
       name: matcher
-      sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e"
+      sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb
       url: "https://pub.dev"
     source: hosted
-    version: "0.12.16"
+    version: "0.12.16+1"
   material_color_utilities:
     dependency: transitive
     description:
       name: material_color_utilities
-      sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41"
+      sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a"
       url: "https://pub.dev"
     source: hosted
-    version: "0.5.0"
+    version: "0.8.0"
   meta:
     dependency: transitive
     description:
       name: meta
-      sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e
+      sha256: d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04
       url: "https://pub.dev"
     source: hosted
-    version: "1.10.0"
+    version: "1.11.0"
   mime:
     dependency: transitive
     description:
@@ -506,10 +530,10 @@ packages:
     dependency: transitive
     description:
       name: path
-      sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917"
+      sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af"
       url: "https://pub.dev"
     source: hosted
-    version: "1.8.3"
+    version: "1.9.0"
   path_provider:
     dependency: "direct main"
     description:
@@ -562,26 +586,26 @@ packages:
     dependency: "direct main"
     description:
       name: permission_handler
-      sha256: "45ff3fbcb99040fde55c528d5e3e6ca29171298a85436274d49c6201002087d6"
+      sha256: "74e962b7fad7ff75959161bb2c0ad8fe7f2568ee82621c9c2660b751146bfe44"
       url: "https://pub.dev"
     source: hosted
-    version: "11.2.0"
+    version: "11.3.0"
   permission_handler_android:
     dependency: transitive
     description:
       name: permission_handler_android
-      sha256: "758284a0976772f9c744d6384fc5dc4834aa61e3f7aa40492927f244767374eb"
+      sha256: "1acac6bae58144b442f11e66621c062aead9c99841093c38f5bcdcc24c1c3474"
       url: "https://pub.dev"
     source: hosted
-    version: "12.0.3"
+    version: "12.0.5"
   permission_handler_apple:
     dependency: transitive
     description:
       name: permission_handler_apple
-      sha256: c6bf440f80acd2a873d3d91a699e4cc770f86e7e6b576dda98759e8b92b39830
+      sha256: bdafc6db74253abb63907f4e357302e6bb786ab41465e8635f362ee71fd8707b
       url: "https://pub.dev"
     source: hosted
-    version: "9.3.0"
+    version: "9.4.0"
   permission_handler_html:
     dependency: transitive
     description:
@@ -594,10 +618,10 @@ packages:
     dependency: transitive
     description:
       name: permission_handler_platform_interface
-      sha256: "5c43148f2bfb6d14c5a8162c0a712afe891f2d847f35fcff29c406b37da43c3c"
+      sha256: "23dfba8447c076ab5be3dee9ceb66aad345c4a648f0cac292c77b1eb0e800b78"
       url: "https://pub.dev"
     source: hosted
-    version: "4.1.0"
+    version: "4.2.0"
   permission_handler_windows:
     dependency: transitive
     description:
@@ -642,10 +666,10 @@ packages:
     dependency: "direct main"
     description:
       name: provider
-      sha256: "9a96a0a19b594dbc5bf0f1f27d2bc67d5f95957359b461cd9feb44ed6ae75096"
+      sha256: c8a055ee5ce3fd98d6fc872478b03823ffdb448699c6ebdbbc71d59b596fd48c
       url: "https://pub.dev"
     source: hosted
-    version: "6.1.1"
+    version: "6.1.2"
   share_plus:
     dependency: "direct main"
     description:
@@ -706,10 +730,10 @@ packages:
     dependency: transitive
     description:
       name: shared_preferences_web
-      sha256: "7b15ffb9387ea3e237bb7a66b8a23d2147663d391cafc5c8f37b2e7b4bde5d21"
+      sha256: "9aee1089b36bd2aafe06582b7d7817fd317ef05fc30e6ba14bff247d0933042a"
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.2"
+    version: "2.3.0"
   shared_preferences_windows:
     dependency: transitive
     description:
@@ -722,10 +746,10 @@ packages:
     dependency: "direct main"
     description:
       name: shared_storage
-      sha256: "7c65a9d64f0f5521256be974cfd74010af12196657cec9f9fb7b03b2f11bcaf6"
+      sha256: cf20428d06af065311b71e09cbfbbfe431e979a3bf9180001c1952129b7c708f
       url: "https://pub.dev"
     source: hosted
-    version: "0.8.0"
+    version: "0.8.1"
   sky_engine:
     dependency: transitive
     description: flutter
@@ -831,26 +855,26 @@ packages:
     dependency: "direct main"
     description:
       name: url_launcher
-      sha256: c512655380d241a337521703af62d2c122bf7b77a46ff7dd750092aa9433499c
+      sha256: "0ecc004c62fd3ed36a2ffcbe0dd9700aee63bd7532d0b642a488b1ec310f492e"
       url: "https://pub.dev"
     source: hosted
-    version: "6.2.4"
+    version: "6.2.5"
   url_launcher_android:
     dependency: transitive
     description:
       name: url_launcher_android
-      sha256: "507dc655b1d9cb5ebc756032eb785f114e415f91557b73bf60b7e201dfedeb2f"
+      sha256: d4ed0711849dd8e33eb2dd69c25db0d0d3fdc37e0a62e629fe32f57a22db2745
       url: "https://pub.dev"
     source: hosted
-    version: "6.2.2"
+    version: "6.3.0"
   url_launcher_ios:
     dependency: transitive
     description:
       name: url_launcher_ios
-      sha256: "75bb6fe3f60070407704282a2d295630cab232991eb52542b18347a8a941df03"
+      sha256: "9149d493b075ed740901f3ee844a38a00b33116c7c5c10d7fb27df8987fb51d5"
       url: "https://pub.dev"
     source: hosted
-    version: "6.2.4"
+    version: "6.2.5"
   url_launcher_linux:
     dependency: transitive
     description:
@@ -871,18 +895,18 @@ packages:
     dependency: transitive
     description:
       name: url_launcher_platform_interface
-      sha256: a932c3a8082e118f80a475ce692fde89dc20fddb24c57360b96bc56f7035de1f
+      sha256: "552f8a1e663569be95a8190206a38187b531910283c3e982193e4f2733f01029"
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.1"
+    version: "2.3.2"
   url_launcher_web:
     dependency: transitive
     description:
       name: url_launcher_web
-      sha256: fff0932192afeedf63cdd50ecbb1bc825d31aed259f02bb8dba0f3b729a5e88b
+      sha256: "3692a459204a33e04bc94f5fb91158faf4f2c8903281ddd82915adecdb1a901d"
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.3"
+    version: "2.3.0"
   url_launcher_windows:
     dependency: transitive
     description:
@@ -907,30 +931,38 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.1.4"
+  vm_service:
+    dependency: transitive
+    description:
+      name: vm_service
+      sha256: b3d56ff4341b8f182b96aceb2fa20e3dcb336b9f867bc0eafc0de10f1048e957
+      url: "https://pub.dev"
+    source: hosted
+    version: "13.0.0"
   web:
     dependency: transitive
     description:
       name: web
-      sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152
+      sha256: "1d9158c616048c38f712a6646e317a3426da10e884447626167240d45209cbad"
       url: "https://pub.dev"
     source: hosted
-    version: "0.3.0"
+    version: "0.5.0"
   webview_flutter:
     dependency: "direct main"
     description:
       name: webview_flutter
-      sha256: d81b68e88cc353e546afb93fb38958e3717282c5ac6e5d3be4a4aef9fc3c1413
+      sha256: "25e1b6e839e8cbfbd708abc6f85ed09d1727e24e08e08c6b8590d7c65c9a8932"
       url: "https://pub.dev"
     source: hosted
-    version: "4.5.0"
+    version: "4.7.0"
   webview_flutter_android:
     dependency: transitive
     description:
       name: webview_flutter_android
-      sha256: "4ea3c4e1b8ed590162b15b8a61b41b1ef3ff179a314627c16ce40c086d94b8af"
+      sha256: "3e5f4e9d818086b0d01a66fb1ff9cc72ab0cc58c71980e3d3661c5685ea0efb0"
       url: "https://pub.dev"
     source: hosted
-    version: "3.14.0"
+    version: "3.15.0"
   webview_flutter_platform_interface:
     dependency: transitive
     description:
@@ -943,10 +975,10 @@ packages:
     dependency: transitive
     description:
       name: webview_flutter_wkwebview
-      sha256: b99ca8d8bae9c6b43d568218691aa537fb0aeae1d7d34eadf112a6aa36d26506
+      sha256: "9bf168bccdf179ce90450b5f37e36fe263f591c9338828d6bf09b6f8d0f57f86"
       url: "https://pub.dev"
     source: hosted
-    version: "3.11.0"
+    version: "3.12.0"
   win32:
     dependency: transitive
     description:
@@ -988,5 +1020,5 @@ packages:
     source: hosted
     version: "3.1.2"
 sdks:
-  dart: ">=3.2.3 <4.0.0"
+  dart: ">=3.3.0 <4.0.0"
-  flutter: ">=3.16.6"
+  flutter: ">=3.19.0"

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.0.2+252 # When changing this, update the tag in main() accordingly
+version: 1.0.4+2254 # When changing this, update the tag in main() accordingly
 
 environment:
   sdk: '>=3.0.0 <4.0.0'