WiFi only BG update toggle (#819) + typo fix

assets/translations/bs.json

@@ -247,7 +247,8 @@
    "backgroundUpdateReqsExplanation": "Background updates may not be possible for all apps.",
    "backgroundUpdateLimitsExplanation": "The success of a background install can only be determined when Obtainium is opened.",
    "verifyLatestTag": "Verify the 'latest' tag",
-   "examptFromBackgroundUpdates": "Exempt from background updates (if enabled)",
+   "exemptFromBackgroundUpdates": "Exempt from background updates (if enabled)",
+   "bgUpdatesOnWiFiOnly": "Disable background updates when not on WiFi",
    "removeAppQuestion": {
       "one": "Želite li ukloniti aplikaciju?",
       "other": "Želite li ukloniti aplikacije?"

assets/translations/de.json

@@ -247,7 +247,8 @@
     "backgroundUpdateReqsExplanation": "Background updates may not be possible for all apps.",
     "backgroundUpdateLimitsExplanation": "The success of a background install can only be determined when Obtainium is opened.",
     "verifyLatestTag": "Verify the 'latest' tag",
-    "examptFromBackgroundUpdates": "Exempt from background updates (if enabled)",
+    "exemptFromBackgroundUpdates": "Exempt from background updates (if enabled)",
+    "bgUpdatesOnWiFiOnly": "Disable background updates when not on WiFi",
     "removeAppQuestion": {
         "one": "App entfernen?",
         "other": "Apps entfernen?"

assets/translations/en.json

@@ -250,7 +250,8 @@
     "verifyLatestTag": "Verify the 'latest' tag",
     "intermediateLinkRegex": "Filter for an 'Intermediate' Link to Visit First",
     "intermediateLinkNotFound": "Intermediate link not found",
-    "examptFromBackgroundUpdates": "Exempt from background updates (if enabled)",
+    "exemptFromBackgroundUpdates": "Exempt from background updates (if enabled)",
+    "bgUpdatesOnWiFiOnly": "Disable background updates when not on WiFi",
     "removeAppQuestion": {
         "one": "Remove App?",
         "other": "Remove Apps?"

assets/translations/es.json

@@ -247,7 +247,8 @@
     "backgroundUpdateReqsExplanation": "Background updates may not be possible for all apps.",
     "backgroundUpdateLimitsExplanation": "The success of a background install can only be determined when Obtainium is opened.",
     "verifyLatestTag": "Verify the 'latest' tag",
-    "examptFromBackgroundUpdates": "Exempt from background updates (if enabled)",
+    "exemptFromBackgroundUpdates": "Exempt from background updates (if enabled)",
+    "bgUpdatesOnWiFiOnly": "Disable background updates when not on WiFi",
     "removeAppQuestion": {
         "one": "¿Eliminar Aplicación?",
         "other": "¿Eliminar Aplicaciones?"

assets/translations/fa.json

@@ -247,7 +247,8 @@
     "backgroundUpdateReqsExplanation": "Background updates may not be possible for all apps.",
     "backgroundUpdateLimitsExplanation": "The success of a background install can only be determined when Obtainium is opened.",
     "verifyLatestTag": "Verify the 'latest' tag",
-    "examptFromBackgroundUpdates": "Exempt from background updates (if enabled)",
+    "exemptFromBackgroundUpdates": "Exempt from background updates (if enabled)",
+    "bgUpdatesOnWiFiOnly": "Disable background updates when not on WiFi",
     "removeAppQuestion": {
         "one": "برنامه حذف شود؟",
         "other": "برنامه ها حذف شوند؟"

assets/translations/fr.json

@@ -247,7 +247,8 @@
     "backgroundUpdateReqsExplanation": "Background updates may not be possible for all apps.",
     "backgroundUpdateLimitsExplanation": "The success of a background install can only be determined when Obtainium is opened.",
     "verifyLatestTag": "Verify the 'latest' tag",
-    "examptFromBackgroundUpdates": "Exempt from background updates (if enabled)",
+    "exemptFromBackgroundUpdates": "Exempt from background updates (if enabled)",
+    "bgUpdatesOnWiFiOnly": "Disable background updates when not on WiFi",
     "removeAppQuestion": {
         "one": "Supprimer l'application ?",
         "other": "Supprimer les applications ?"

assets/translations/hu.json

@@ -246,7 +246,8 @@
     "backgroundUpdateReqsExplanation": "Background updates may not be possible for all apps.",
     "backgroundUpdateLimitsExplanation": "The success of a background install can only be determined when Obtainium is opened.",
     "verifyLatestTag": "Verify the 'latest' tag",
-    "examptFromBackgroundUpdates": "Exempt from background updates (if enabled)",
+    "exemptFromBackgroundUpdates": "Exempt from background updates (if enabled)",
+    "bgUpdatesOnWiFiOnly": "Disable background updates when not on WiFi",
     "removeAppQuestion": {
         "one": "Eltávolítja az alkalmazást?",
         "other": "Eltávolítja az alkalmazást?"

assets/translations/it.json

@@ -247,7 +247,8 @@
     "backgroundUpdateReqsExplanation": "Background updates may not be possible for all apps.",
     "backgroundUpdateLimitsExplanation": "The success of a background install can only be determined when Obtainium is opened.",
     "verifyLatestTag": "Verify the 'latest' tag",
-    "examptFromBackgroundUpdates": "Exempt from background updates (if enabled)",
+    "exemptFromBackgroundUpdates": "Exempt from background updates (if enabled)",
+    "bgUpdatesOnWiFiOnly": "Disable background updates when not on WiFi",
     "removeAppQuestion": {
         "one": "Rimuovere l'app?",
         "other": "Rimuovere le app?"

assets/translations/ja.json

@@ -248,7 +248,8 @@
     "backgroundUpdateReqsExplanation": "バックグラウンドアップデートは、すべてのアプリで可能とは限りません。",
     "backgroundUpdateLimitsExplanation": "バックグラウンドアップデートが成功したかどうかは、Obtainiumを起動したときにしか判断できません。",
     "verifyLatestTag": "'latest'タグを確認する",
-    "examptFromBackgroundUpdates": "Exempt from background updates (if enabled)",
+    "exemptFromBackgroundUpdates": "Exempt from background updates (if enabled)",
+    "bgUpdatesOnWiFiOnly": "Disable background updates when not on WiFi",
     "removeAppQuestion": {
         "one": "アプリを削除しますか？",
         "other": "アプリを削除しますか？"

assets/translations/pl.json

@@ -253,7 +253,8 @@
     "backgroundUpdateReqsExplanation": "Aktualizacje w tle mogą nie być możliwe dla wszystkich aplikacji.",
     "backgroundUpdateLimitsExplanation": "Powodzenie instalacji w tle można określić dopiero po otwarciu Obtainium.",
     "verifyLatestTag": "Zweryfikuj najnowszy tag",
-    "examptFromBackgroundUpdates": "Exempt from background updates (if enabled)",
+    "exemptFromBackgroundUpdates": "Exempt from background updates (if enabled)",
+    "bgUpdatesOnWiFiOnly": "Disable background updates when not on WiFi",
     "removeAppQuestion": {
         "one": "Usunąć aplikację?",
         "few": "Usunąć aplikacje?",

assets/translations/ru.json

@@ -247,7 +247,8 @@
     "backgroundUpdateReqsExplanation": "Background updates may not be possible for all apps.",
     "backgroundUpdateLimitsExplanation": "The success of a background install can only be determined when Obtainium is opened.",
     "verifyLatestTag": "Verify the 'latest' tag",
-    "examptFromBackgroundUpdates": "Exempt from background updates (if enabled)",
+    "exemptFromBackgroundUpdates": "Exempt from background updates (if enabled)",
+    "bgUpdatesOnWiFiOnly": "Disable background updates when not on WiFi",
     "removeAppQuestion": {
         "one": "Удалить приложение?",
         "other": "Удалить приложения?"

assets/translations/zh.json

@@ -247,8 +247,9 @@
     "enableBackgroundUpdates": "启用后台更新",
     "backgroundUpdateReqsExplanation": "后台更新未必适用于所有的应用。",
     "backgroundUpdateLimitsExplanation": "只有在启动 Obtainium 时才能确认安装是否成功。",
-    "examptFromBackgroundUpdates": "Exempt from background updates (if enabled)",
     "verifyLatestTag": "验证“Latest”标签",
+    "exemptFromBackgroundUpdates": "Exempt from background updates (if enabled)",
+    "bgUpdatesOnWiFiOnly": "Disable background updates when not on WiFi",
     "removeAppQuestion": {
         "one": "是否删除应用？",
         "other": "是否删除应用？"

lib/pages/settings.dart

@@ -252,7 +252,32 @@ class _SettingsPageState extends State<SettingsPage> {
                                                 style: Theme.of(context)
                                                     .textTheme
                                                     .labelSmall),
-                                            height8
+                                            height8,
+                                            if (settingsProvider
+                                                .enableBackgroundUpdates)
+                                              Column(
+                                                children: [
+                                                  height16,
+                                                  Row(
+                                                    mainAxisAlignment:
+                                                        MainAxisAlignment
+                                                            .spaceBetween,
+                                                    children: [
+                                                      Flexible(
+                                                          child: Text(tr(
+                                                              'bgUpdatesOnWiFiOnly'))),
+                                                      Switch(
+                                                          value: settingsProvider
+                                                              .bgUpdatesOnWiFiOnly,
+                                                          onChanged: (value) {
+                                                            settingsProvider
+                                                                    .bgUpdatesOnWiFiOnly =
+                                                                value;
+                                                          })
+                                                    ],
+                                                  ),
+                                                ],
+                                              ),
                                           ],
                                         )
                                       : const SizedBox.shrink();

lib/providers/apps_provider.dart

@@ -9,6 +9,7 @@ import 'package:android_alarm_manager_plus/android_alarm_manager_plus.dart';
 import 'package:android_intent_plus/flag.dart';
 import 'package:android_package_installer/android_package_installer.dart';
 import 'package:android_package_manager/android_package_manager.dart';
+import 'package:connectivity_plus/connectivity_plus.dart';
 import 'package:device_info_plus/device_info_plus.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
@@ -366,7 +367,7 @@ class AppsProvider with ChangeNotifier {
     if (!settingsProvider.enableBackgroundUpdates) {
       return false;
     }
-    if (app.additionalSettings['examptFromBackgroundUpdates'] == true) {
+    if (app.additionalSettings['exemptFromBackgroundUpdates'] == true) {
       return false;
     }
     if (app.apkUrls.length > 1) {
@@ -1323,6 +1324,12 @@ Future<void> bgUpdateCheck(int taskId, Map<String, dynamic>? params) async {
     // If in update mode...
     var didCompleteChecking = false;
     CheckingUpdatesNotification? notif;
+    var networkRestricted = false;
+    if (settingsProvider.bgUpdatesOnWiFiOnly) {
+      var netResult = await (Connectivity().checkConnectivity());
+      networkRestricted = (netResult != ConnectivityResult.wifi) &&
+          (netResult != ConnectivityResult.ethernet);
+    }
     // Loop through all updates and check each
     for (int i = 0; i < toCheck.length; i++) {
       var appId = toCheck[i].key;
@@ -1335,7 +1342,8 @@ Future<void> bgUpdateCheck(int taskId, Map<String, dynamic>? params) async {
               cancelExisting: true);
           App? newApp = await appsProvider.checkUpdate(appId);
           if (newApp != null) {
-            if (!(await appsProvider.canInstallSilently(
+            if (networkRestricted ||
+                !(await appsProvider.canInstallSilently(
                     app!.app, settingsProvider))) {
               notificationsProvider.notify(
                   UpdateNotification([newApp], id: newApp.id.hashCode - 1));

lib/providers/settings_provider.dart

@@ -319,6 +319,15 @@ class SettingsProvider with ChangeNotifier {
     notifyListeners();
   }
 
+  bool get bgUpdatesOnWiFiOnly {
+    return prefs?.getBool('bgUpdatesOnWiFiOnly') ?? false;
+  }
+
+  set bgUpdatesOnWiFiOnly(bool val) {
+    prefs?.setBool('bgUpdatesOnWiFiOnly', val);
+    notifyListeners();
+  }
+
   DateTime get lastBGCheckTime {
     int? temp = prefs?.getInt('lastBGCheckTime');
     return temp != null

lib/providers/source_provider.dart

@@ -427,8 +427,8 @@ abstract class AppSource {
     ],
     [GeneratedFormTextField('appName', label: tr('appName'), required: false)],
     [
-      GeneratedFormSwitch('examptFromBackgroundUpdates',
+      GeneratedFormSwitch('exemptFromBackgroundUpdates',
-          label: tr('examptFromBackgroundUpdates'))
+          label: tr('exemptFromBackgroundUpdates'))
     ]
   ];
 

pubspec.lock

@@ -114,6 +114,22 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.17.2"
+  connectivity_plus:
+    dependency: "direct main"
+    description:
+      name: connectivity_plus
+      sha256: "77a180d6938f78ca7d2382d2240eb626c0f6a735d0bfdce227d8ffb80f95c48b"
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.0.2"
+  connectivity_plus_platform_interface:
+    dependency: transitive
+    description:
+      name: connectivity_plus_platform_interface
+      sha256: cf1d1c28f4416f8c654d7dc3cd638ec586076255d407cef3ddbdaf178272a71a
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.2.4"
   convert:
     dependency: transitive
     description:
@@ -454,6 +470,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.0.0"
+  nm:
+    dependency: transitive
+    description:
+      name: nm
+      sha256: "2c9aae4127bdc8993206464fcc063611e0e36e72018696cd9631023a31b24254"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.5.0"
   path:
     dependency: transitive
     description:

pubspec.yaml

@@ -64,6 +64,7 @@ dependencies:
   flutter_markdown: ^0.6.14
   flutter_archive: ^5.0.0
   hsluv: ^1.1.3
+  connectivity_plus: ^4.0.2
 
 dev_dependencies:
   flutter_test: