Merge pull request #2292 from ImranR98/dev

ImranR98 · web-flow · commit c702dbcefecb · 2025-05-17T01:12:09.000-04:00
- Add missing update ownership permission (#2078) - Update colour picker component to pick up layout fix (#2258) - Fix a few more title case lines (#2284) - Added battery optimization notice to welcome message (#2291)
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
@@ -69,6 +69,7 @@
     <uses-permission android:name="android.permission.WAKE_LOCK" />
     <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" />
     <uses-permission android:name="android.permission.REQUEST_DELETE_PACKAGES" />
+    <uses-permission android:name="android.permission.ENFORCE_UPDATE_OWNERSHIP"/>
     <uses-permission
         android:name="android.permission.WRITE_EXTERNAL_STORAGE"
         android:maxSdkVersion="29" />
diff --git a/assets/translations/bs.json b/assets/translations/bs.json
@@ -326,6 +326,7 @@
     "sortMethod": "Sort Method",
     "welcome": "Welcome",
     "documentationLinksNote": "The Obtainium GitHub page linked below contains links to videos, articles, discussions and other resources that will help you understand how to use the app.",
+    "batteryOptimizationNote": "Note that background downloads may work more reliably if you disable OS battery optimizations for Obtainium.",
     "removeAppQuestion": {
         "one": "Želite li ukloniti aplikaciju?",
         "other": "Želite li ukloniti aplikacije?"
diff --git a/assets/translations/ca.json b/assets/translations/ca.json
@@ -326,6 +326,7 @@
     "sortMethod": "Mètode d'ordenació",
     "welcome": "Benvinguda",
     "documentationLinksNote": "La pàgina GitHub d'Obtainium enllaçada a sota conté enllaços a vídeos, articles, debats i altres recursos que t'ajudaran a entendre com usar l'aplicació.",
+    "batteryOptimizationNote": "Note that background downloads may work more reliably if you disable OS battery optimizations for Obtainium.",
     "removeAppQuestion": {
         "one": "¿Suprimeixo l'aplicació?",
         "other": "¿Suprimeixo les aplicacions?"
diff --git a/assets/translations/cs.json b/assets/translations/cs.json
@@ -326,6 +326,7 @@
     "sortMethod": "Metoda třídění",
     "welcome": "Vítejte na",
     "documentationLinksNote": "Níže odkazovaná stránka Obtainium GitHub obsahuje odkazy na videa, články, diskuse a další zdroje, které vám pomohou pochopit, jak aplikaci používat.",
+    "batteryOptimizationNote": "Note that background downloads may work more reliably if you disable OS battery optimizations for Obtainium.",
     "removeAppQuestion": {
         "one": "Odstranit Apku?",
         "other": "Odstranit Apky?"
diff --git a/assets/translations/da.json b/assets/translations/da.json
@@ -326,6 +326,7 @@
     "sortMethod": "Sorteringsmetode",
     "welcome": "Velkommen",
     "documentationLinksNote": "Obtainiums GitHub-side, som der linkes til nedenfor, indeholder links til videoer, artikler, diskussioner og andre ressourcer, som kan hjælpe dig med at forstå, hvordan du bruger appen.",
+    "batteryOptimizationNote": "Note that background downloads may work more reliably if you disable OS battery optimizations for Obtainium.",
     "removeAppQuestion": {
         "one": "Fjern app?",
         "other": "Fjern apps?"
diff --git a/assets/translations/de.json b/assets/translations/de.json
@@ -326,6 +326,7 @@
     "sortMethod": "Sortierverfahren",
     "welcome": "Willkommen",
     "documentationLinksNote": "Die unten verlinkte GitHub-Seite von Obtainium enthält Links zu Videos, Artikeln, Diskussionen und anderen Ressourcen, die Ihnen helfen werden, die Verwendung der App zu verstehen.",
+    "batteryOptimizationNote": "Note that background downloads may work more reliably if you disable OS battery optimizations for Obtainium.",
     "removeAppQuestion": {
         "one": "App entfernen?",
         "other": "Apps entfernen?"
diff --git a/assets/translations/en-EO.json b/assets/translations/en-EO.json
@@ -326,6 +326,7 @@
     "sortMethod": "Sort Method",
     "welcome": "Welcome",
     "documentationLinksNote": "The Obtainium GitHub page linked below contains links to videos, articles, discussions and other resources that will help you understand how to use the app.",
+    "batteryOptimizationNote": "Note that background downloads may work more reliably if you disable OS battery optimizations for Obtainium.",
     "removeAppQuestion": {
         "one": "Forigi la aplikaĵon?",
         "other": "Forigi la aplikaĵojn?"
diff --git a/assets/translations/en.json b/assets/translations/en.json
@@ -327,9 +327,10 @@
     "sortMethod": "Sort method",
     "welcome": "Welcome",
     "documentationLinksNote": "The Obtainium GitHub page linked below contains links to videos, articles, discussions and other resources that will help you understand how to use the app.",
+    "batteryOptimizationNote": "Note that background downloads may work more reliably if you disable OS battery optimizations for Obtainium.",
     "removeAppQuestion": {
-        "one": "Remove App?",
-        "other": "Remove Apps?"
+        "one": "Remove app?",
+        "other": "Remove apps?"
     },
     "tooManyRequestsTryAgainInMinutes": {
         "one": "Too many requests (rate limited) - try again in {} minute",
diff --git a/assets/translations/es.json b/assets/translations/es.json
@@ -326,6 +326,7 @@
     "sortMethod": "Método de clasificación",
     "welcome": "Bienvenido",
     "documentationLinksNote": "La página GitHub de Obtainium enlazada a continuación contiene enlaces a vídeos, artículos, debates y otros recursos que te ayudarán a entender cómo utilizar la aplicación.",
+    "batteryOptimizationNote": "Note that background downloads may work more reliably if you disable OS battery optimizations for Obtainium.",
     "removeAppQuestion": {
         "one": "¿Eliminar aplicación?",
         "other": "¿Eliminar aplicaciones?"
diff --git a/assets/translations/fa.json b/assets/translations/fa.json
@@ -326,6 +326,7 @@
     "sortMethod": "Sort Method",
     "welcome": "Welcome",
     "documentationLinksNote": "The Obtainium GitHub page linked below contains links to videos, articles, discussions and other resources that will help you understand how to use the app.",
+    "batteryOptimizationNote": "Note that background downloads may work more reliably if you disable OS battery optimizations for Obtainium.",
     "removeAppQuestion": {
         "one": "برنامه حذف شود؟",
         "other": "برنامه ها حذف شوند؟"
diff --git a/assets/translations/fr.json b/assets/translations/fr.json
@@ -326,6 +326,7 @@
     "sortMethod": "Méthode de tri",
     "welcome": "Bienvenue",
     "documentationLinksNote": "La page GitHub d'Obtainium, dont le lien figure ci-dessous, contient des liens vers des vidéos, des articles, des discussions et d'autres ressources qui vous aideront à comprendre comment utiliser l'application.",
+    "batteryOptimizationNote": "Note that background downloads may work more reliably if you disable OS battery optimizations for Obtainium.",
     "removeAppQuestion": {
         "one": "Supprimer l'application ?",
         "other": "Supprimer les applications ?"
diff --git a/assets/translations/hu.json b/assets/translations/hu.json
@@ -326,6 +326,7 @@
     "sortMethod": "Rendezési eljárás",
     "welcome": "Üdvözöljük!",
     "documentationLinksNote": "Az alábbi hivatkozás az Obtainium GitHub oldalára vezet, amely további videók, cikkek, beszélgetések és egyéb források hivatkozásait tartalmazza, amelyek segítenek megérteni az alkalmazás használatát.",
+    "batteryOptimizationNote": "Note that background downloads may work more reliably if you disable OS battery optimizations for Obtainium.",
     "removeAppQuestion": {
         "one": "Eltávolítja az alkalmazást?",
         "other": "Eltávolítja az alkalmazásokat?"
diff --git a/assets/translations/id.json b/assets/translations/id.json
@@ -326,6 +326,7 @@
     "sortMethod": "Metode Penyortiran",
     "welcome": "Selamat datang.",
     "documentationLinksNote": "Halaman GitHub Obtainium yang ditautkan di bawah ini berisi tautan ke video, artikel, diskusi, dan sumber daya lain yang akan membantu Anda memahami cara menggunakan aplikasi.",
+    "batteryOptimizationNote": "Note that background downloads may work more reliably if you disable OS battery optimizations for Obtainium.",
     "removeAppQuestion": {
         "one": "Hapus aplikasi?",
         "other": "Hapus aplikasi?"
diff --git a/assets/translations/it.json b/assets/translations/it.json
@@ -326,6 +326,7 @@
     "sortMethod": "Metodo di ordinamento",
     "welcome": "Benvenuti",
     "documentationLinksNote": "La pagina GitHub di Obtainium collegata qui sotto contiene collegamenti a video, articoli, discussioni e altre risorse che vi aiuteranno a capire come utilizzare l'applicazione.",
+    "batteryOptimizationNote": "Note that background downloads may work more reliably if you disable OS battery optimizations for Obtainium.",
     "removeAppQuestion": {
         "one": "Rimuovere l'app?",
         "other": "Rimuovere le app?"
diff --git a/assets/translations/ja.json b/assets/translations/ja.json
@@ -326,6 +326,7 @@
     "sortMethod": "ソート方法",
     "welcome": "ようこそ",
     "documentationLinksNote": "以下のリンクにあるObtainium GitHubページには、ビデオ、記事、ディスカッション、その他のリソースへのリンクがあり、アプリの使い方を理解するのに役立ちます。",
+    "batteryOptimizationNote": "Note that background downloads may work more reliably if you disable OS battery optimizations for Obtainium.",
     "removeAppQuestion": {
         "one": "アプリを削除しますか？",
         "other": "アプリを削除しますか？"
diff --git a/assets/translations/ko.json b/assets/translations/ko.json
@@ -326,6 +326,7 @@
     "sortMethod": "정렬 방법",
     "welcome": "환영",
     "documentationLinksNote": "아래에 링크된 Obtainium 깃허브 페이지에는 앱 사용 방법을 이해하는 데 도움이 되는 동영상, 기사, 토론 및 기타 리소스에 대한 링크가 포함되어 있습니다.",
+    "batteryOptimizationNote": "Note that background downloads may work more reliably if you disable OS battery optimizations for Obtainium.",
     "removeAppQuestion": {
         "one": "앱을 제거하시겠습니까?",
         "other": "앱을 제거하시겠습니까?"
diff --git a/assets/translations/nl.json b/assets/translations/nl.json
@@ -326,6 +326,7 @@
     "sortMethod": "Sorteermethode",
     "welcome": "Welkom",
     "documentationLinksNote": "De GitHub pagina van Obtainium waarnaar hieronder wordt gelinkt bevat links naar video's, artikelen, discussies en andere bronnen die je zullen helpen begrijpen hoe je de app kunt gebruiken.",
+    "batteryOptimizationNote": "Note that background downloads may work more reliably if you disable OS battery optimizations for Obtainium.",
     "removeAppQuestion": {
         "one": "App verwijderen?",
         "other": "Apps verwijderen?"
diff --git a/assets/translations/pl.json b/assets/translations/pl.json
@@ -326,6 +326,7 @@
     "sortMethod": "Metoda sortowania",
     "welcome": "Witamy",
     "documentationLinksNote": "Strona Obtainium GitHub, do której link znajduje się poniżej, zawiera linki do filmów, artykułów, dyskusji i innych zasobów, które pomogą ci zrozumieć, jak korzystać z aplikacji.",
+    "batteryOptimizationNote": "Note that background downloads may work more reliably if you disable OS battery optimizations for Obtainium.",
     "removeAppQuestion": {
         "one": "Usunąć aplikację?",
         "few": "Usunąć aplikacje?",
diff --git a/assets/translations/pt-BR.json b/assets/translations/pt-BR.json
@@ -326,6 +326,7 @@
     "sortMethod": "Método de ordenação",
     "welcome": "Boas vindas",
     "documentationLinksNote": "A página do Obtainium no GitHub visível abaixo contém links de vídeos, artigos, discussões, e outros recursos que podem te ajudar ao usar o app.",
+    "batteryOptimizationNote": "Note that background downloads may work more reliably if you disable OS battery optimizations for Obtainium.",
     "removeAppQuestion": {
         "one": "Remover app?",
         "other": "Remover apps?"
diff --git a/assets/translations/pt.json b/assets/translations/pt.json
@@ -326,6 +326,7 @@
     "sortMethod": "Método de ordenação",
     "welcome": "Bem-vindo",
     "documentationLinksNote": "A página do Obtainium no GitHub com a ligação abaixo contém ligações para vídeos, artigos, discussões e outros recursos que o ajudarão a compreender como utilizar a aplicação.",
+    "batteryOptimizationNote": "Note that background downloads may work more reliably if you disable OS battery optimizations for Obtainium.",
     "removeAppQuestion": {
         "one": "Remover aplicativo?",
         "other": "Remover aplicativos?"
diff --git a/assets/translations/ru.json b/assets/translations/ru.json
@@ -326,6 +326,7 @@
     "sortMethod": "Метод сортировки",
     "welcome": "Добро пожаловать",
     "documentationLinksNote": "На странице Obtainium GitHub, ссылка на которую приведена ниже, содержатся ссылки на видео, статьи, обсуждения и другие ресурсы, которые помогут вам понять, как пользоваться приложением.",
+    "batteryOptimizationNote": "Note that background downloads may work more reliably if you disable OS battery optimizations for Obtainium.",
     "removeAppQuestion": {
         "one": "Удалить приложение?",
         "other": "Удалить приложения?"
diff --git a/assets/translations/sv.json b/assets/translations/sv.json
@@ -326,6 +326,7 @@
     "sortMethod": "Sorteringsmetod",
     "welcome": "Välkommen",
     "documentationLinksNote": "Obtainium GitHub-sidan som länkas nedan innehåller länkar till videor, artiklar, diskussioner och andra resurser som hjälper dig att förstå hur du använder appen.",
+    "batteryOptimizationNote": "Note that background downloads may work more reliably if you disable OS battery optimizations for Obtainium.",
     "removeAppQuestion": {
         "one": "Ta Bort App?",
         "other": "Ta Bort Appar?"
diff --git a/assets/translations/tr.json b/assets/translations/tr.json
@@ -326,6 +326,7 @@
     "sortMethod": "Sıralama Yöntemi",
     "welcome": "Hoş geldiniz",
     "documentationLinksNote": "Aşağıda bağlantısı verilen Obtainium GitHub sayfası, uygulamayı nasıl kullanacağınızı anlamanıza yardımcı olacak videolara, makalelere, tartışmalara ve diğer kaynaklara bağlantılar içerir.",
+    "batteryOptimizationNote": "Note that background downloads may work more reliably if you disable OS battery optimizations for Obtainium.",
     "removeAppQuestion": {
         "one": "Uygulamayı Kaldır?",
         "other": "Uygulamaları Kaldır?"
diff --git a/assets/translations/uk.json b/assets/translations/uk.json
@@ -326,6 +326,7 @@
     "sortMethod": "Метод сортування",
     "welcome": "Ласкаво просимо.",
     "documentationLinksNote": "Сторінка Obtainium на GitHub, посилання на яку наведено нижче, містить посилання на відео, статті, дискусії та інші ресурси, які допоможуть вам зрозуміти, як користуватися додатком.",
+    "batteryOptimizationNote": "Note that background downloads may work more reliably if you disable OS battery optimizations for Obtainium.",
     "removeAppQuestion": {
         "one": "Видалити застосунок?",
         "other": "Видалити застосунки?"
diff --git a/assets/translations/vi.json b/assets/translations/vi.json
@@ -326,6 +326,7 @@
     "sortMethod": "Sort Method",
     "welcome": "Welcome",
     "documentationLinksNote": "The Obtainium GitHub page linked below contains links to videos, articles, discussions and other resources that will help you understand how to use the app.",
+    "batteryOptimizationNote": "Note that background downloads may work more reliably if you disable OS battery optimizations for Obtainium.",
     "removeAppQuestion": {
         "one": "Gỡ ứng dụng?",
         "other": "Gỡ ứng dụng?"
diff --git a/assets/translations/zh-Hant-TW.json b/assets/translations/zh-Hant-TW.json
@@ -326,6 +326,7 @@
     "sortMethod": "排序方式",
     "welcome": "歡迎",
     "documentationLinksNote": "下方連結的 Obtainium GitHub 頁面包含影片、文章、討論及其他資源，能幫助你瞭解如何使用這款應用程式。",
+    "batteryOptimizationNote": "Note that background downloads may work more reliably if you disable OS battery optimizations for Obtainium.",
     "removeAppQuestion": {
         "one": "移除應用程式？",
         "other": "移除應用程式？"
diff --git a/assets/translations/zh.json b/assets/translations/zh.json
@@ -327,6 +327,7 @@
     "sortMethod": "排序方法",
     "welcome": "欢迎光临",
     "documentationLinksNote": "下面链接的 Obtainium GitHub 页面包含视频、文章、讨论和其他资源的链接，可帮助您了解如何使用该应用程序。",
+    "batteryOptimizationNote": "Note that background downloads may work more reliably if you disable OS battery optimizations for Obtainium.",
     "removeAppQuestion": {
         "one": "是否删除应用？",
         "other": "是否删除应用？"
diff --git a/lib/app_sources/vivoappstore.dart b/lib/app_sources/vivoappstore.dart
@@ -13,6 +13,7 @@ class VivoAppStore extends AppSource {
     hosts = ['h5.appstore.vivo.com.cn', 'h5coml.vivo.com.cn'];
     naiveStandardVersionDetection = true;
     canSearch = true;
+    allowOverride = false;
   }
 
   @override
diff --git a/lib/pages/apps.dart b/lib/pages/apps.dart
@@ -671,13 +671,15 @@ class AppsPageState extends State<AppsPage> {
                 formItems.add(GeneratedFormSwitch('updates',
                     label: tr('updateX', args: [
                       plural('apps', existingUpdateIdsAllOrSelected.length)
+                          .toLowerCase()
                     ]),
                     defaultValue: true));
               }
               if (newInstallIdsAllOrSelected.isNotEmpty) {
                 formItems.add(GeneratedFormSwitch('installs',
                     label: tr('installX', args: [
                       plural('apps', newInstallIdsAllOrSelected.length)
+                          .toLowerCase()
                     ]),
                     defaultValue: existingUpdateIdsAllOrSelected.isEmpty));
               }
@@ -696,7 +698,8 @@ class AppsPageState extends State<AppsPage> {
                         newInstallIdsAllOrSelected.length +
                         trackOnlyUpdateIdsAllOrSelected.length;
                     return GeneratedFormModal(
-                      title: tr('changeX', args: [plural('apps', totalApps)]),
+                      title: tr('changeX',
+                          args: [plural('apps', totalApps).toLowerCase()]),
                       items: formItems.map((e) => [e]).toList(),
                       initValid: true,
                     );
diff --git a/lib/pages/home.dart b/lib/pages/home.dart
@@ -1,5 +1,6 @@
 import 'dart:async';
 
+import 'package:android_intent_plus/android_intent.dart';
 import 'package:animations/animations.dart';
 import 'package:app_links/app_links.dart';
 import 'package:easy_localization/easy_localization.dart';
@@ -80,6 +81,30 @@ class _HomePageState extends State<HomePage> {
                               decoration: TextDecoration.underline,
                               fontWeight: FontWeight.bold),
                         )),
+                    Column(
+                      crossAxisAlignment: CrossAxisAlignment.start,
+                      children: [
+                        Text(tr('batteryOptimizationNote')),
+                        GestureDetector(
+                          onTap: () {
+                            final intent = AndroidIntent(
+                              action:
+                                  'android.settings.IGNORE_BATTERY_OPTIMIZATION_SETTINGS',
+                              package:
+                                  obtainiumId, // Replace with your app's package name
+                            );
+
+                            intent.launch();
+                          },
+                          child: Text(
+                            tr('settings'),
+                            style: const TextStyle(
+                                decoration: TextDecoration.underline,
+                                fontWeight: FontWeight.bold),
+                          ),
+                        )
+                      ],
+                    )
                   ],
                 ),
                 actions: [
diff --git a/pubspec.lock b/pubspec.lock
diff --git a/pubspec.yaml b/pubspec.yaml
