Merge pull request #273 from ImranR98/dev

Reverse changes related to App ID changes (#270)

README.md

@@ -22,6 +22,15 @@ Currently supported App sources:
 - "HTML" (Fallback)
   - Any other URL that returns an HTML page with links to APK files (if multiple, the last file alphabetically is picked)
 
+## Installation
+
+[<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)
+
 ## Limitations
 - App installs happen asynchronously and the success/failure of an install cannot be determined directly. This results in install statuses and versions sometimes being out of sync with the OS until the next launch or until the problem is manually corrected.
 - Auto (unattended) updates are unsupported due to a lack of any capable Flutter plugin.

assets/translations/hu.json

@@ -208,10 +208,10 @@
     "language": "Nyelv",
     "storagePermissionDenied": "Tárhely engedély megtagadva",
     "selectedCategorizeWarning": "Ez felváltja a kiválasztott alkalmazások meglévő kategória-beállításait.",
-    "filterAPKsByRegEx": "Filter APKs by Regular Expression",
-    "removeFromObtainium": "Remove from Obtainium",
-    "uninstallFromDevice": "Uninstall from Device",
-    "onlyWorksWithNonVersionDetectApps": "Only works for Apps with version detection disabled.",
+    "filterAPKsByRegEx": "Az APK-k szűrése reguláris kifejezéssel",
+    "removeFromObtainium": "Eltávolítás az Obtainiumból",
+    "uninstallFromDevice": "Eltávolítás a készülékről",
+    "onlyWorksWithNonVersionDetectApps": "Csak azoknál az alkalmazásoknál működik, amelyeknél a verzióérzékelés le van tiltva.",
     "removeAppQuestion": {
         "one": "Eltávolítja az alkalmazást?",
         "other": "Eltávolítja az alkalmazást?"

assets/translations/it.json

@@ -207,15 +207,15 @@
     "addCategory": "Aggiungi categoria",
     "label": "Etichetta",
     "language": "Lingua",
-    "storagePermissionDenied": "Storage permission denied",
-    "selectedCategorizeWarning": "This will replace any existing category settings for the selected Apps.",
-    "filterAPKsByRegEx": "Filter APKs by Regular Expression",
-    "removeFromObtainium": "Remove from Obtainium",
-    "uninstallFromDevice": "Uninstall from Device",
-    "onlyWorksWithNonVersionDetectApps": "Only works for Apps with version detection disabled.",
+    "storagePermissionDenied": "Accesso ai file non autorizzato",
+    "selectedCategorizeWarning": "Ciò sostituirà le impostazioni di categoria esistenti per le App selezionate.",
+    "filterAPKsByRegEx": "Filtra file APK con espressioni regolari",
+    "removeFromObtainium": "Rimuovi da Obtainium",
+    "uninstallFromDevice": "Disinstalla dal dispositivo",
+    "onlyWorksWithNonVersionDetectApps": "Funziona solo per le App con il rilevamento della versione disattivato.",
     "removeAppQuestion": {
         "one": "Rimuovere l'App?",
-        "other": "Rimuovere l'App?"
+        "other": "Rimuovere le App?"
     },
     "tooManyRequestsTryAgainInMinutes": {
         "one": "Troppe richieste (traffico limitato) - riprova tra {} minuto",

assets/translations/ja.json

@@ -210,9 +210,9 @@
     "storagePermissionDenied": "ストレージ権限が拒否されました",
     "selectedCategorizeWarning": "これにより、選択したアプリの既存のカテゴリ設定がすべて置き換えられます。",
     "filterAPKsByRegEx": "正規表現でAPKを絞り込む",
-    "removeFromObtainium": "Remove from Obtainium",
-    "uninstallFromDevice": "Uninstall from Device",
-    "onlyWorksWithNonVersionDetectApps": "Only works for Apps with version detection disabled.",
+    "removeFromObtainium": "Obtainiumから削除する",
+    "uninstallFromDevice": "デバイスからアンインストールする",
+    "onlyWorksWithNonVersionDetectApps": "バージョン検出を無効にしているアプリにのみ動作します。",
     "removeAppQuestion": {
         "one": "アプリを削除しますか？",
         "other": "アプリを削除しますか？"

lib/main.dart

@@ -21,7 +21,7 @@ import 'package:easy_localization/src/easy_localization_controller.dart';
 // ignore: implementation_imports
 import 'package:easy_localization/src/localization.dart';
 
-const String currentVersion = '0.10.7';
+const String currentVersion = '0.10.9';
 const String currentReleaseTag =
     'v$currentVersion-beta'; // KEEP THIS IN SYNC WITH GITHUB RELEASES
 

lib/pages/app.dart

@@ -347,6 +347,8 @@ class _AppPageState extends State<AppPage> {
                                             if (res.isNotEmpty && mounted) {
                                               Navigator.of(context).pop();
                                             }
+                                          }).catchError((e) {
+                                            showError(e, context);
                                           });
                                         }).catchError((e) {
                                           showError(e, context);
@@ -391,18 +393,3 @@ class _AppPageState extends State<AppPage> {
     );
   }
 }
-
-class RemoveAppsModal extends StatefulWidget {
-  const RemoveAppsModal({super.key, this.apps = const []});
-  final List<App> apps;
-
-  @override
-  State<RemoveAppsModal> createState() => _RemoveAppsModalState();
-}
-
-class _RemoveAppsModalState extends State<RemoveAppsModal> {
-  @override
-  Widget build(BuildContext context) {
-    return const Placeholder();
-  }
-}

lib/pages/apps.dart

@@ -391,28 +391,6 @@ class AppsPageState extends State<AppsPage> {
                                     : () {
                                         appsProvider.removeAppsWithModal(
                                             context, selectedApps.toList());
-                                        // showDialog<Map<String, dynamic>?>(
-                                        //     context: context,
-                                        //     builder: (BuildContext ctx) {
-                                        //       return GeneratedFormModal(
-                                        //         title: tr(
-                                        //             'removeSelectedAppsQuestion'),
-                                        //         items: const [],
-                                        //         initValid: true,
-                                        //         message: tr(
-                                        //             'xWillBeRemovedButRemainInstalled',
-                                        //             args: [
-                                        //               plural('apps',
-                                        //                   selectedApps.length)
-                                        //             ]),
-                                        //       );
-                                        //     }).then((values) {
-                                        //   if (values != null) {
-                                        //     appsProvider.removeApps(selectedApps
-                                        //         .map((e) => e.id)
-                                        //         .toList());
-                                        //   }
-                                        // });
                                       },
                                 tooltip: tr('removeSelectedApps'),
                                 icon: const Icon(Icons.delete_outline_outlined),

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.10.7+113 # When changing this, update the tag in main() accordingly
+version: 0.10.9+115 # When changing this, update the tag in main() accordingly
 
 environment:
   sdk: '>=2.18.2 <3.0.0'