Merge pull request #993 from ImranR98/dev

Separate notif channel title translations (#979), Add 'skip update notification' per-app toggle (#980), Better error for some incompatible APK cases (#981), Add whole-page version extraction for HTML (#989), Better relative link resolution (#989), Clearer wording (#991), Fixed issues in some translation files (#992)
Upgrade packages, increment version
2025-07-30 20:40:16 +02:00 · 2023-10-12 19:54:12 -04:00 · 2023-10-12 19:51:55 -04:00 · 2023-10-12 19:51:04 -04:00 · 2023-10-12 19:33:38 -04:00 · 2023-10-12 19:24:23 -04:00
22 changed files with 896 additions and 713 deletions
--- a/assets/translations/bs.json
+++ b/assets/translations/bs.json
@@ -263,6 +263,17 @@
    "debugMenu": "Debug Menu",
    "bgTaskStarted": "Background task started - check logs.",
    "runBgCheckNow": "Run Background Update Check Now",
+    "versionExtractWholePage": "Apply Version Extraction Regex to Entire Page",
+    "installing": "Installing",
+    "skipUpdateNotifications": "Skip update notifications",
+    "updatesAvailableNotifChannel": "Dostupna ažuriranja",
+    "appsUpdatedNotifChannel": "Aplikacije su ažurirane",
+    "appsPossiblyUpdatedNotifChannel": "App Updates Attempted",
+    "errorCheckingUpdatesNotifChannel": "Greška pri provjeri ažuriranja",
+    "appsRemovedNotifChannel": "Aplikacije su uklonjene",
+    "downloadingXNotifChannel": "Preuzimanje {}",
+    "completeAppInstallationNotifChannel": "Dovršite instalaciju aplikacije",
+    "checkingForUpdatesNotifChannel": "Tražim moguće nadogradnje",
    "removeAppQuestion": {
        "one": "Želite li ukloniti aplikaciju?",
        "other": "Želite li ukloniti aplikacije?"
--- a/assets/translations/cs.json
+++ b/assets/translations/cs.json
@@ -263,6 +263,17 @@
    "debugMenu": "Debug Menu",
    "bgTaskStarted": "Background task started - check logs.",
    "runBgCheckNow": "Run Background Update Check Now",
+    "versionExtractWholePage": "Apply Version Extraction Regex to Entire Page",
+    "installing": "Installing",
+    "skipUpdateNotifications": "Skip update notifications",
+    "updatesAvailableNotifChannel": "dostupné aktualizace",
+    "appsUpdatedNotifChannel": "Aplikace aktualizovány",
+    "appsPossiblyUpdatedNotifChannel": "Byly provedeny pokusy o aktualizaci aplikací",
+    "errorCheckingUpdatesNotifChannel": "Chybová kontrola aktualizací",
+    "appsRemovedNotifChannel": "Odstraněné aplikace",
+    "downloadingXNotifChannel": "download {}",
+    "completeAppInstallationNotifChannel": "Dokončit instalaci aplikace",
+    "checkingForUpdatesNotifChannel": "Zkontrolovat aktualizace",
    "removeAppQuestion": {
        "one": "Odstranit Apku?",
        "other": "Odstranit Apky?"
@@ -316,4 +327,3 @@
        "other": "{} a {} další aplikace mohly být aktualizovány."
    }
 }
-
--- a/assets/translations/de.json
+++ b/assets/translations/de.json
@@ -263,6 +263,17 @@
    "debugMenu": "Debug Menü",
    "bgTaskStarted": "Hintergrundaufgabe gestartet – Logs prüfen.",
    "runBgCheckNow": "Hintergrundaktualisierungsprüfung jetzt durchführen",
+    "versionExtractWholePage": "Apply Version Extraction Regex to Entire Page",
+    "installing": "Installing",
+    "skipUpdateNotifications": "Skip update notifications",
+    "updatesAvailableNotifChannel": "Aktualisierungen verfügbar",
+    "appsUpdatedNotifChannel": "Apps aktualisiert",
+    "appsPossiblyUpdatedNotifChannel": "App Aktualisierungen wurden versucht",
+    "errorCheckingUpdatesNotifChannel": "Fehler beim Prüfen auf Aktualisierungen",
+    "appsRemovedNotifChannel": "Apps entfernt",
+    "downloadingXNotifChannel": "Lade {} herunter",
+    "completeAppInstallationNotifChannel": "App Installation abschließen",
+    "checkingForUpdatesNotifChannel": "Nach Aktualisierungen suchen",
    "removeAppQuestion": {
        "one": "App entfernen?",
        "other": "Apps entfernen?"
--- a/assets/translations/en.json
+++ b/assets/translations/en.json
@@ -252,7 +252,7 @@
    "bgUpdatesOnWiFiOnly": "Disable background updates when not on WiFi",
    "autoSelectHighestVersionCode": "Auto-select highest versionCode APK",
    "versionExtractionRegEx": "Version Extraction RegEx",
-    "matchGroupToUse": "Match Group to Use",
+    "matchGroupToUse": "Match Group to Use for Version Extraction Regex",
    "highlightTouchTargets": "Highlight less obvious touch targets",
    "pickExportDir": "Pick Export Directory",
    "autoExportOnChanges": "Auto-export on changes",
@@ -263,6 +263,17 @@
    "debugMenu": "Debug Menu",
    "bgTaskStarted": "Background task started - check logs.",
    "runBgCheckNow": "Run Background Update Check Now",
+    "versionExtractWholePage": "Apply Version Extraction Regex to Entire Page",
+    "installing": "Installing",
+    "skipUpdateNotifications": "Skip update notifications",
+    "updatesAvailableNotifChannel": "Updates Available",
+    "appsUpdatedNotifChannel": "Apps Updated",
+    "appsPossiblyUpdatedNotifChannel": "App Updates Attempted",
+    "errorCheckingUpdatesNotifChannel": "Error Checking for Updates",
+    "appsRemovedNotifChannel": "Apps Removed",
+    "downloadingXNotifChannel": "Downloading {}",
+    "completeAppInstallationNotifChannel": "Complete App Installation",
+    "checkingForUpdatesNotifChannel": "Checking for Updates",
    "removeAppQuestion": {
        "one": "Remove App?",
        "other": "Remove Apps?"
--- a/assets/translations/es.json
+++ b/assets/translations/es.json
@@ -263,6 +263,17 @@
    "debugMenu": "Debug Menu",
    "bgTaskStarted": "Background task started - check logs.",
    "runBgCheckNow": "Run Background Update Check Now",
+    "versionExtractWholePage": "Apply Version Extraction Regex to Entire Page",
+    "installing": "Installing",
+    "skipUpdateNotifications": "Skip update notifications",
+    "updatesAvailableNotifChannel": "Actualizaciones Disponibles",
+    "appsUpdatedNotifChannel": "Aplicaciones Actualizadas",
+    "appsPossiblyUpdatedNotifChannel": "App Updates Attempted",
+    "errorCheckingUpdatesNotifChannel": "Error Buscando Actualizaciones",
+    "appsRemovedNotifChannel": "Aplicaciones Eliminadas",
+    "downloadingXNotifChannel": "Descargando {}",
+    "completeAppInstallationNotifChannel": "Instalación Completa de la Aplicación",
+    "checkingForUpdatesNotifChannel": "Buscando Actualizaciones",
    "removeAppQuestion": {
        "one": "¿Eliminar Aplicación?",
        "other": "¿Eliminar Aplicaciones?"
--- a/assets/translations/fa.json
+++ b/assets/translations/fa.json
@@ -263,6 +263,17 @@
    "debugMenu": "Debug Menu",
    "bgTaskStarted": "Background task started - check logs.",
    "runBgCheckNow": "Run Background Update Check Now",
+    "versionExtractWholePage": "Apply Version Extraction Regex to Entire Page",
+    "installing": "Installing",
+    "skipUpdateNotifications": "Skip update notifications",
+    "updatesAvailableNotifChannel": "بروزرسانی در دسترس ",
+    "appsUpdatedNotifChannel": "برنامه ها به روز شدند",
+    "appsPossiblyUpdatedNotifChannel": "App Updates Attempted",
+    "errorCheckingUpdatesNotifChannel": "خطا در بررسی به‌روزرسانی‌ها",
+    "appsRemovedNotifChannel": "برنامه ها حذف شدند",
+    "downloadingXNotifChannel": "در حال دانلود {}",
+    "completeAppInstallationNotifChannel": "نصب کامل برنامه",
+    "checkingForUpdatesNotifChannel": "بررسی به‌روزرسانی‌ها",
    "removeAppQuestion": {
        "one": "برنامه حذف شود؟",
        "other": "برنامه ها حذف شوند؟"
--- a/assets/translations/fr.json
+++ b/assets/translations/fr.json
@@ -263,6 +263,17 @@
    "debugMenu": "Debug Menu",
    "bgTaskStarted": "Background task started - check logs.",
    "runBgCheckNow": "Run Background Update Check Now",
+    "versionExtractWholePage": "Apply Version Extraction Regex to Entire Page",
+    "installing": "Installing",
+    "skipUpdateNotifications": "Skip update notifications",
+    "updatesAvailableNotifChannel": "Mises à jour disponibles",
+    "appsUpdatedNotifChannel": "Applications mises à jour",
+    "appsPossiblyUpdatedNotifChannel": "App Updates Attempted",
+    "errorCheckingUpdatesNotifChannel": "Erreur lors de la vérification des mises à jour",
+    "appsRemovedNotifChannel": "Applications supprimées",
+    "downloadingXNotifChannel": "Téléchargement {}",
+    "completeAppInstallationNotifChannel": "Installation complète de l'application",
+    "checkingForUpdatesNotifChannel": "Vérification des mises à jour",
    "removeAppQuestion": {
        "one": "Supprimer l'application ?",
        "other": "Supprimer les applications ?"
--- a/assets/translations/hu.json
+++ b/assets/translations/hu.json
@@ -242,7 +242,6 @@
    "appsPossiblyUpdated": "App frissítési kísérlet",
    "appsPossiblyUpdatedNotifDescription": "Értesíti a felhasználót, hogy egy vagy több alkalmazás frissítése lehetséges a háttérben",
    "xWasPossiblyUpdatedToY": "{} frissítve lehet erre {}.",
-    "enableBackgroundUpdates": "Enable background updates",
    "backgroundUpdateReqsExplanation": "Előfordulhat, hogy nem minden appnál lehetséges a háttérbeli frissítés.",
    "backgroundUpdateLimitsExplanation": "A háttérben történő telepítés sikeressége csak az Obtainium megnyitásakor állapítható meg.",
    "verifyLatestTag": "Ellenőrizze a „legújabb” címkét",
@@ -264,6 +263,17 @@
    "bgTaskStarted": "A háttérfeladat elindult – ellenőrizze a naplókat.",
    "enableBackgroundUpdates": "Frissítések a háttérben",
    "runBgCheckNow": "Futtassa a Háttérben frissítés ellenőrzését most",
+    "versionExtractWholePage": "Apply Version Extraction Regex to Entire Page",
+    "installing": "Installing",
+    "skipUpdateNotifications": "Skip update notifications",
+    "updatesAvailableNotifChannel": "Frissítések érhetők el",
+    "appsUpdatedNotifChannel": "Alkalmazások frissítve",
+    "appsPossiblyUpdatedNotifChannel": "App frissítési kísérlet",
+    "errorCheckingUpdatesNotifChannel": "Hiba a frissítések keresésekor",
+    "appsRemovedNotifChannel": "Alkalmazások eltávolítva",
+    "downloadingXNotifChannel": "{} letöltés",
+    "completeAppInstallationNotifChannel": "Teljes app telepítés",
+    "checkingForUpdatesNotifChannel": "Frissítések keresése",
    "removeAppQuestion": {
        "one": "Eltávolítja az alkalmazást?",
        "other": "Eltávolítja az alkalmazást?"
--- a/assets/translations/it.json
+++ b/assets/translations/it.json
@@ -263,6 +263,17 @@
    "debugMenu": "Debug Menu",
    "bgTaskStarted": "Background task started - check logs.",
    "runBgCheckNow": "Run Background Update Check Now",
+    "versionExtractWholePage": "Apply Version Extraction Regex to Entire Page",
+    "installing": "Installing",
+    "skipUpdateNotifications": "Skip update notifications",
+    "updatesAvailableNotifChannel": "Aggiornamenti disponibili",
+    "appsUpdatedNotifChannel": "App aggiornate",
+    "appsPossiblyUpdatedNotifChannel": "App Updates Attempted",
+    "errorCheckingUpdatesNotifChannel": "Controllo degli errori per gli aggiornamenti",
+    "appsRemovedNotifChannel": "App rimosse",
+    "downloadingXNotifChannel": "Scaricamento di {} in corso",
+    "completeAppInstallationNotifChannel": "Completa l'installazione dell'app",
+    "checkingForUpdatesNotifChannel": "Controllo degli aggiornamenti in corso",
    "removeAppQuestion": {
        "one": "Rimuovere l'app?",
        "other": "Rimuovere le app?"
--- a/assets/translations/ja.json
+++ b/assets/translations/ja.json
@@ -263,6 +263,17 @@
    "debugMenu": "Debug Menu",
    "bgTaskStarted": "Background task started - check logs.",
    "runBgCheckNow": "Run Background Update Check Now",
+    "versionExtractWholePage": "Apply Version Extraction Regex to Entire Page",
+    "installing": "Installing",
+    "skipUpdateNotifications": "Skip update notifications",
+    "updatesAvailableNotifChannel": "アップデートが利用可能",
+    "appsUpdatedNotifChannel": "アプリをアップデートしました",
+    "appsPossiblyUpdatedNotifChannel": "アプリのアップデートを試行",
+    "errorCheckingUpdatesNotifChannel": "アップデート確認中のエラー",
+    "appsRemovedNotifChannel": "削除されたアプリ",
+    "downloadingXNotifChannel": "{} をダウンロード中",
+    "completeAppInstallationNotifChannel": "アプリのインストールを完了する",
+    "checkingForUpdatesNotifChannel": "アップデートを確認中",
    "removeAppQuestion": {
        "one": "アプリを削除しますか？",
        "other": "アプリを削除しますか？"
--- a/assets/translations/pl.json
+++ b/assets/translations/pl.json
@@ -247,7 +247,7 @@
    "backgroundUpdateLimitsExplanation": "Powodzenie instalacji w tle można określić dopiero po otwarciu Obtainium.",
    "verifyLatestTag": "Zweryfikuj najnowszy tag",
    "intermediateLinkRegex": "Filtr linków \"pośrednich\" do odwiedzenia w pierwszej kolejności",
-    "intermediateLinkNotFound": "Nie znaleziono linku pośredniego"
+    "intermediateLinkNotFound": "Nie znaleziono linku pośredniego",
    "exemptFromBackgroundUpdates": "Wyklucz z uaktualnień w tle (jeśli są włączone)",
    "bgUpdatesOnWiFiOnly": "Wyłącz aktualizacje w tle, gdy nie ma połączenia z Wi-Fi",
    "autoSelectHighestVersionCode": "Automatycznie wybierz najwyższy kod wersji APK",
@@ -263,6 +263,17 @@
    "debugMenu": "Menu debugowania",
    "bgTaskStarted": "Uruchomiono zadanie w tle - sprawdź logi.",
    "runBgCheckNow": "Wymuś sprawdzenie aktualizacji w tle",
+    "versionExtractWholePage": "Apply Version Extraction Regex to Entire Page",
+    "installing": "Installing",
+    "skipUpdateNotifications": "Skip update notifications",
+    "updatesAvailableNotifChannel": "Dostępne aktualizacje",
+    "appsUpdatedNotifChannel": "Zaktualizowane aplikacje",
+    "appsPossiblyUpdatedNotifChannel": "Informuj o próbach aktualizacji",
+    "errorCheckingUpdatesNotifChannel": "Sprawdzanie błędów aktualizacji",
+    "appsRemovedNotifChannel": "Usunięte aplikacje",
+    "downloadingXNotifChannel": "Pobieranie {}",
+    "completeAppInstallationNotifChannel": "Ukończenie instalacji aplikacji",
+    "checkingForUpdatesNotifChannel": "Sprawdzanie aktualizacji",
    "removeAppQuestion": {
        "one": "Usunąć aplikację?",
        "few": "Usunąć aplikacje?",
@@ -341,3 +352,4 @@
        "many": "{} i {} innych apek mogło zostać zaktualizowanych.",
        "other": "{} i {} inne apki mogły zostać zaktualizowane."
    }
+}
--- a/assets/translations/pt.json
+++ b/assets/translations/pt.json
@@ -263,6 +263,17 @@
    "debugMenu": "Menu Debug",
    "bgTaskStarted": "Tarefa em segundo plano iniciada - verifique os logs.",
    "runBgCheckNow": "Execute a verificação de atualização em segundo plano agora",
+    "versionExtractWholePage": "Apply Version Extraction Regex to Entire Page",
+    "installing": "Installing",
+    "skipUpdateNotifications": "Skip update notifications",
+    "updatesAvailableNotifChannel": "Atualizações Disponíveis",
+    "appsUpdatedNotifChannel": "Apps Atualizados",
+    "appsPossiblyUpdatedNotifChannel": "Tentativas de atualização de Apps",
+    "errorCheckingUpdatesNotifChannel": "Erro ao Procurar por Atualizações",
+    "appsRemovedNotifChannel": "Apps Removidos",
+    "downloadingXNotifChannel": "Baixando {}",
+    "completeAppInstallationNotifChannel": "Instalação completa do App",
+    "checkingForUpdatesNotifChannel": "Checando por Atualizações",
    "removeAppQuestion": {
        "one": "Remover App?",
        "other": "Remover Apps?"
--- a/assets/translations/ru.json
+++ b/assets/translations/ru.json
@@ -263,6 +263,17 @@
    "debugMenu": "Меню Отладки",
    "bgTaskStarted": "Фоновая задача начата - проверьте журналы.",
    "runBgCheckNow": "Запустить проверку фонового обновления сейчас",
+    "versionExtractWholePage": "Apply Version Extraction Regex to Entire Page",
+    "installing": "Installing",
+    "skipUpdateNotifications": "Skip update notifications",
+    "updatesAvailableNotifChannel": "Доступны обновления",
+    "appsUpdatedNotifChannel": "Приложения обновлены",
+    "appsPossiblyUpdatedNotifChannel": "Попытки обновления приложений",
+    "errorCheckingUpdatesNotifChannel": "Ошибка при проверке обновлений",
+    "appsRemovedNotifChannel": "Приложение удалено",
+    "downloadingXNotifChannel": "Загрузка {}",
+    "completeAppInstallationNotifChannel": "Завершение установки приложения",
+    "checkingForUpdatesNotifChannel": "Проверка обновлений",
    "removeAppQuestion": {
        "one": "Удалить приложение?",
        "other": "Удалить приложения?"
--- a/assets/translations/zh.json
+++ b/assets/translations/zh.json
@@ -263,6 +263,17 @@
    "debugMenu": "调试选项",
    "bgTaskStarted": "后台任务已启动 - 详见日志",
    "runBgCheckNow": "立即进行后台更新检查",
+    "versionExtractWholePage": "Apply Version Extraction Regex to Entire Page",
+    "installing": "Installing",
+    "skipUpdateNotifications": "Skip update notifications",
+    "updatesAvailableNotifChannel": "更新可用",
+    "appsUpdatedNotifChannel": "应用已更新",
+    "appsPossiblyUpdatedNotifChannel": "已尝试更新应用",
+    "errorCheckingUpdatesNotifChannel": "检查更新出错",
+    "appsRemovedNotifChannel": "应用已删除",
+    "downloadingXNotifChannel": "正在下载{}",
+    "completeAppInstallationNotifChannel": "完成应用安装",
+    "checkingForUpdatesNotifChannel": "正在检查更新",
    "removeAppQuestion": {
        "one": "是否删除应用？",
        "other": "是否删除应用？"
--- a/lib/app_sources/html.dart
+++ b/lib/app_sources/html.dart
@@ -22,7 +22,7 @@ String ensureAbsoluteUrl(String ambiguousUrl, Uri referenceAbsoluteUrl) {
  } else if (ambiguousUrl.split('/').where((e) => e.isNotEmpty).length == 1) {
    return '${referenceAbsoluteUrl.origin}/${currPathSegments.join('/')}/$ambiguousUrl';
  } else {
-    return '${referenceAbsoluteUrl.origin}/${currPathSegments.sublist(0, currPathSegments.length - 1).join('/')}/$ambiguousUrl';
+    return '${referenceAbsoluteUrl.origin}/${currPathSegments.sublist(0, currPathSegments.length - (currPathSegments.last.contains('.') ? 1 : 0)).join('/')}/$ambiguousUrl';
  }
 }

@@ -117,6 +117,8 @@ class HTML extends AppSource {
            label: tr('versionExtractionRegEx'),
            required: false,
            additionalValidators: [(value) => regExValidator(value)]),
+      ],
+      [
        GeneratedFormTextField('matchGroupToUse',
            label: tr('matchGroupToUse'),
            required: false,
@@ -131,6 +133,10 @@ class HTML extends AppSource {
                return intValidator(value);
              }
            ])
+      ],
+      [
+        GeneratedFormSwitch('versionExtractWholePage',
+            label: tr('versionExtractWholePage'))
      ]
    ];
    overrideVersionDetectionFormDefault('noVersionDetection',
@@ -212,7 +218,8 @@ class HTML extends AppSource {
      var versionExtractionRegEx =
          additionalSettings['versionExtractionRegEx'] as String?;
      if (versionExtractionRegEx?.isNotEmpty == true) {
-        var match = RegExp(versionExtractionRegEx!).allMatches(rel);
+        var match = RegExp(versionExtractionRegEx!).allMatches(
+            res.body.split('\r\n').join('\n').split('\n').join('\\n'));
        if (match.isEmpty) {
          throw NoVersionError();
        }
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -19,7 +19,7 @@ import 'package:easy_localization/src/easy_localization_controller.dart';
 // ignore: implementation_imports
 import 'package:easy_localization/src/localization.dart';

-const String currentVersion = '0.14.26';
+const String currentVersion = '0.14.27';
 const String currentReleaseTag =
    'v$currentVersion-beta'; // KEEP THIS IN SYNC WITH GITHUB RELEASES

--- a/lib/pages/apps.dart
+++ b/lib/pages/apps.dart
@@ -566,7 +566,7 @@ class AppsPageState extends State<AppsPage> {
                                .toInt()
                                .toString()
                          ])
-                        : tr('pleaseWait'),
+                        : tr('installing'),
                    textAlign: (listedApps[index].downloadProgress! >= 0)
                        ? TextAlign.start
                        : TextAlign.end,
--- a/lib/providers/apps_provider.dart
+++ b/lib/providers/apps_provider.dart
@@ -263,12 +263,13 @@ class AppsProvider with ChangeNotifier {
    return downloadedFile;
  }

-  Future<File> handleAPKIDChange(App app, PackageInfo newInfo,
+  Future<File> handleAPKIDChange(App app, PackageInfo? newInfo,
      File downloadedFile, String downloadUrl) async {
    // If the APK package ID is different from the App ID, it is either new (using a placeholder ID) or the ID has changed
    // The former case should be handled (give the App its real ID), the latter is a security issue
-    if (app.id != newInfo.packageName) {
    var isTempId = SourceProvider().isTempId(app);
+    if (newInfo != null) {
+      if (app.id != newInfo.packageName) {
        if (apps[app.id] != null && !isTempId && !app.allowIdChange) {
          throw IDChangedError(newInfo.packageName!);
        }
@@ -283,6 +284,9 @@ class AppsProvider with ChangeNotifier {
          await saveApps([app], onlyIfExists: !isTempId && !idChangeWasAllowed);
        }
      }
+    } else if (isTempId) {
+      throw ObtainiumError('Could not get ID from APK');
+    }
    return downloadedFile;
  }

@@ -344,7 +348,7 @@ class AppsProvider with ChangeNotifier {
            await pm.getPackageArchiveInfo(archiveFilePath: apks.first.path);
      }
      downloadedFile =
-          await handleAPKIDChange(app, newInfo!, downloadedFile, downloadUrl);
+          await handleAPKIDChange(app, newInfo, downloadedFile, downloadUrl);
      // Delete older versions of the file if any
      for (var file in downloadedFile.parent.listSync()) {
        var fn = file.path.split('/').last;
@@ -1435,9 +1439,12 @@ Future<void> bgUpdateCheck(int taskId, Map<String, dynamic>? params) async {
            if (newApp != null) {
              if (networkRestricted ||
                  !(await appsProvider.canInstallSilently(app!.app))) {
+                if (newApp.additionalSettings['skipUpdateNotifications'] !=
+                    true) {
                  toNotify.add(newApp);
                }
              }
+            }
            if (i == (toCheck.length - 1)) {
              didCompleteChecking = true;
            }
--- a/lib/providers/notifications_provider.dart
+++ b/lib/providers/notifications_provider.dart
@@ -28,7 +28,7 @@ class UpdateNotification extends ObtainiumNotification {
            tr('updatesAvailable'),
            '',
            'UPDATES_AVAILABLE',
-            tr('updatesAvailable'),
+            tr('updatesAvailableNotifChannel'),
            tr('updatesAvailableNotifDescription'),
            Importance.max) {
    message = updates.isEmpty
@@ -42,8 +42,14 @@ class UpdateNotification extends ObtainiumNotification {

 class SilentUpdateNotification extends ObtainiumNotification {
  SilentUpdateNotification(List<App> updates, {int? id})
-      : super(id ?? 3, tr('appsUpdated'), '', 'APPS_UPDATED', tr('appsUpdated'),
-            tr('appsUpdatedNotifDescription'), Importance.defaultImportance) {
+      : super(
+            id ?? 3,
+            tr('appsUpdated'),
+            '',
+            'APPS_UPDATED',
+            tr('appsUpdatedNotifChannel'),
+            tr('appsUpdatedNotifDescription'),
+            Importance.defaultImportance) {
    message = updates.length == 1
        ? tr('xWasUpdatedToY',
            args: [updates[0].finalName, updates[0].latestVersion])
@@ -59,7 +65,7 @@ class SilentUpdateAttemptNotification extends ObtainiumNotification {
            tr('appsPossiblyUpdated'),
            '',
            'APPS_POSSIBLY_UPDATED',
-            tr('appsPossiblyUpdated'),
+            tr('appsPossiblyUpdatedNotifChannel'),
            tr('appsPossiblyUpdatedNotifDescription'),
            Importance.defaultImportance) {
    message = updates.length == 1
@@ -77,15 +83,21 @@ class ErrorCheckingUpdatesNotification extends ObtainiumNotification {
            tr('errorCheckingUpdates'),
            error,
            'BG_UPDATE_CHECK_ERROR',
-            tr('errorCheckingUpdates'),
+            tr('errorCheckingUpdatesNotifChannel'),
            tr('errorCheckingUpdatesNotifDescription'),
            Importance.high);
 }

 class AppsRemovedNotification extends ObtainiumNotification {
  AppsRemovedNotification(List<List<String>> namedReasons)
-      : super(6, tr('appsRemoved'), '', 'APPS_REMOVED', tr('appsRemoved'),
-            tr('appsRemovedNotifDescription'), Importance.max) {
+      : super(
+            6,
+            tr('appsRemoved'),
+            '',
+            'APPS_REMOVED',
+            tr('appsRemovedNotifChannel'),
+            tr('appsRemovedNotifDescription'),
+            Importance.max) {
    message = '';
    for (var r in namedReasons) {
      message += '${tr('xWasRemovedDueToErrorY', args: [r[0], r[1]])} \n';
@@ -101,7 +113,7 @@ class DownloadNotification extends ObtainiumNotification {
            tr('downloadingX', args: [appName]),
            '',
            'APP_DOWNLOADING',
-            tr('downloadingX', args: [tr('app')]),
+            tr('downloadingXNotifChannel', args: [tr('app')]),
            tr('downloadNotifDescription'),
            Importance.low,
            onlyAlertOnce: true,
@@ -113,7 +125,7 @@ final completeInstallationNotification = ObtainiumNotification(
    tr('completeAppInstallation'),
    tr('obtainiumMustBeOpenToInstallApps'),
    'COMPLETE_INSTALL',
-    tr('completeAppInstallation'),
+    tr('completeAppInstallationNotifChannel'),
    tr('completeAppInstallationNotifDescription'),
    Importance.max);

@@ -124,7 +136,7 @@ class CheckingUpdatesNotification extends ObtainiumNotification {
            tr('checkingForUpdates'),
            appName,
            'BG_UPDATE_CHECK',
-            tr('checkingForUpdates'),
+            tr('checkingForUpdatesNotifChannel'),
            tr('checkingForUpdatesNotifDescription'),
            Importance.min);
 }
--- a/lib/providers/source_provider.dart
+++ b/lib/providers/source_provider.dart
@@ -442,6 +442,10 @@ abstract class AppSource {
    [
      GeneratedFormSwitch('exemptFromBackgroundUpdates',
          label: tr('exemptFromBackgroundUpdates'))
+    ],
+    [
+      GeneratedFormSwitch('skipUpdateNotifications',
+          label: tr('skipUpdateNotifications'))
    ]
  ];

--- a/pubspec.lock
+++ b/pubspec.lock
@@ -142,10 +142,10 @@ packages:
    dependency: transitive
    description:
      name: cross_file
-      sha256: fd832b5384d0d6da4f6df60b854d33accaaeb63aa9e10e736a87381f08dee2cb
+      sha256: "445db18de832dba8d851e287aff8ccf169bed30d2e94243cb54c7d2f1ed2142c"
      url: "https://pub.dev"
    source: hosted
-    version: "0.3.3+5"
+    version: "0.3.3+6"
  crypto:
    dependency: transitive
    description:
@@ -238,10 +238,10 @@ packages:
    dependency: transitive
    description:
      name: file
-      sha256: "1b92bec4fc2a72f59a8e15af5f52cd441e4a7860b49499d69dfa817af20e925d"
+      sha256: "5fc22d7c25582e38ad9a8515372cd9a93834027aacf1801cf01164dac0ffa08c"
      url: "https://pub.dev"
    source: hosted
-    version: "6.1.4"
+    version: "7.0.0"
  file_picker:
    dependency: "direct main"
    description:
@@ -658,10 +658,10 @@ packages:
    dependency: transitive
    description:
      name: shared_preferences_linux
-      sha256: c2eb5bf57a2fe9ad6988121609e47d3e07bb3bdca5b6f8444e4cf302428a128a
+      sha256: "9f2cbcf46d4270ea8be39fa156d86379077c8a5228d9dfdb1164ae0bb93f1faa"
      url: "https://pub.dev"
    source: hosted
-    version: "2.3.1"
+    version: "2.3.2"
  shared_preferences_platform_interface:
    dependency: transitive
    description:
@@ -682,10 +682,10 @@ packages:
    dependency: transitive
    description:
      name: shared_preferences_windows
-      sha256: f763a101313bd3be87edffe0560037500967de9c394a714cd598d945517f694f
+      sha256: "841ad54f3c8381c480d0c9b508b89a34036f512482c407e6df7a9c4aa2ef8f59"
      url: "https://pub.dev"
    source: hosted
-    version: "2.3.1"
+    version: "2.3.2"
  shared_storage:
    dependency: "direct main"
    description:
--- a/pubspec.yaml
+++ b/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: 0.14.26+218 # When changing this, update the tag in main() accordingly
+version: 0.14.27+219 # When changing this, update the tag in main() accordingly

 environment:
  sdk: '>=3.0.0 <4.0.0'
Author	SHA1	Message	Date
Imran Remtulla	f6c6cd5cb8	Merge pull request #993 from ImranR98/dev Separate notif channel title translations (#979), Add 'skip update notification' per-app toggle (#980), Better error for some incompatible APK cases (#981), Add whole-page version extraction for HTML (#989), Better relative link resolution (#989), Clearer wording (#991), Fixed issues in some translation files (#992)	2023-10-12 19:54:12 -04:00
Imran Remtulla	67b56cee50	Upgrade packages, increment version	2023-10-12 19:51:55 -04:00
Imran Remtulla	2d7465cca6	Separate notif channel title translations (#979 )	2023-10-12 19:51:04 -04:00
Imran Remtulla	d06f20690d	Add 'skip update notification' per-app toggle (#980 )	2023-10-12 19:33:38 -04:00
Imran Remtulla	e613a494ff	Better error for some incompatible APK cases (#981 )	2023-10-12 19:24:23 -04:00
Imran Remtulla	503a01675e	Clearer wording (#991 )	2023-10-12 19:10:02 -04:00
Imran Remtulla	723f7e63e9	Add whole-page version extraction for HTML (#989 )	2023-10-12 19:06:59 -04:00
Imran Remtulla	7ff6916e5f	Better relative link resolution (#989 )	2023-10-12 18:57:47 -04:00
Imran Remtulla	910ed26525	Fixed issues in some translation files	2023-10-12 18:31:31 -04:00