Increment version

assets: Update Simplified Chinese

README.md

@@ -1,4 +1,4 @@
-# ![Obtainium Icon](./android/app/src/main/res/drawable/ic_notification.png) Obtainium
+# ![Obtainium Icon](./assets/graphics/icon_small.png) Obtainium
 
 Get Android App Updates Directly From the Source.
 

assets/translations/de.json

@@ -210,6 +210,7 @@
     "label": "Bezeichnung",
     "language": "Sprache",
     "storagePermissionDenied": "Storage permission denied",
+    "selectedCategorizeWarning": "This will replace any existing category settings for the selected Apps.",
     "tooManyRequestsTryAgainInMinutes": {
         "one": "Zu viele Anfragen (Rate begrenzt) - versuchen Sie es in {} Minute erneut",
         "other": "Zu viele Anfragen (Rate begrenzt) - versuchen Sie es in {} Minuten erneut"

assets/translations/en.json

@@ -210,6 +210,7 @@
     "label": "Label",
     "language": "Language",
     "storagePermissionDenied": "Storage permission denied",
+    "selectedCategorizeWarning": "This will replace any existing category settings for the selected Apps.",
     "tooManyRequestsTryAgainInMinutes": {
         "one": "Too many requests (rate limited) - try again in {} minute",
         "other": "Too many requests (rate limited) - try again in {} minutes"

assets/translations/hu.json

@@ -209,6 +209,7 @@
     "label": "Címke",
     "language": "Language",
     "storagePermissionDenied": "Storage permission denied",
+    "selectedCategorizeWarning": "This will replace any existing category settings for the selected Apps.",
     "tooManyRequestsTryAgainInMinutes": {
         "one": "Túl sok kérés (korlátozott arány) – próbálja újra {} perc múlva",
         "other": "Túl sok kérés (korlátozott arány) – próbálja újra {} perc múlva"

assets/translations/it.json

@@ -210,6 +210,7 @@
     "label": "Etichetta",
     "language": "Lingua",
     "storagePermissionDenied": "Storage permission denied",
+    "selectedCategorizeWarning": "This will replace any existing category settings for the selected Apps.",
     "tooManyRequestsTryAgainInMinutes": {
         "one": "Troppe richieste (traffico limitato) - riprova tra {} minuto",
         "other": "Troppe richieste (traffico limitato) - riprova tra {} minuti"

assets/translations/ja.json

@@ -210,6 +210,7 @@
     "label": "ラベル",
     "language": "言語",
     "storagePermissionDenied": "Storage permission denied",
+    "selectedCategorizeWarning": "This will replace any existing category settings for the selected Apps.",
     "tooManyRequestsTryAgainInMinutes": {
         "one": "リクエストが多すぎます（レート制限）- {}分後に再試行してください",
         "other": "リクエストが多すぎます（レート制限）- {}分後に再試行してください"

assets/translations/zh.json

@@ -12,7 +12,7 @@
     "ok": "好的",
     "and": "和",
     "startedBgUpdateTask": "开始后台检查更新任务",
-    "bgUpdateIgnoreAfterIs": "Bg update ignoreAfter is  {}",
+    "bgUpdateIgnoreAfterIs": "下次后台更新检查  {}",
     "startedActualBGUpdateCheck": "后台检查更新已开始",
     "bgUpdateTaskFinished": "后台检查更新已完成",
     "firstRun": "这是你第一次运行 Obtainium",
@@ -199,17 +199,18 @@
     "downloadNotifDescription": "通知用户下载进度",
     "noAPKFound": "未找到安装包",
     "noVersionDetection": "无版本检测",
-    "categorize": "Categorize",
+    "categorize": "归档",
-    "categories": "Categories",
+    "categories": "归档",
-    "category": "Category",
+    "category": "类别",
-    "noCategory": "No Category",
+    "noCategory": "无类别",
-    "noCategories": "No Categories",
+    "noCategories": "无类别",
-    "deleteCategoriesQuestion": "Delete Categories?",
+    "deleteCategoriesQuestion": "删除所有类别？",
-    "categoryDeleteWarning": "All Apps in deleted categories will be set to uncategorized.",
+    "categoryDeleteWarning": "所有被删除类别的应用程序将被设置为无类别",
-    "addCategory": "Add Category",
+    "addCategory": "添加类别",
-    "label": "Label",
+    "label": "标签",
-    "language": "Language",
+    "language": "语言",
-    "storagePermissionDenied": "Storage permission denied",
+    "storagePermissionDenied": "存储权限已被拒绝",
+    "selectedCategorizeWarning": "这将取代所选应用程序的任何现有类别",
     "tooManyRequestsTryAgainInMinutes": {
         "one": "请求过多 (API 限制) - 在 {} 分钟后重试",
         "other": "请求过多 (API 限制) - 在 {} 分钟后重试"

lib/components/generated_form_modal.dart

@@ -10,13 +10,15 @@ class GeneratedFormModal extends StatefulWidget {
       required this.items,
       this.initValid = false,
       this.message = '',
-      this.additionalWidgets = const []});
+      this.additionalWidgets = const [],
+      this.singleNullReturnButton});
 
   final String title;
   final String message;
   final List<List<GeneratedFormItem>> items;
   final bool initValid;
   final List<Widget> additionalWidgets;
+  final String? singleNullReturnButton;
 
   @override
   State<GeneratedFormModal> createState() => _GeneratedFormModalState();
@@ -64,8 +66,11 @@ class _GeneratedFormModalState extends State<GeneratedFormModal> {
             onPressed: () {
               Navigator.of(context).pop(null);
             },
-            child: Text(tr('cancel'))),
+            child: Text(widget.singleNullReturnButton == null
-        TextButton(
+                ? tr('cancel')
+                : widget.singleNullReturnButton!)),
+        widget.singleNullReturnButton == null
+            ? TextButton(
                 onPressed: !valid
                     ? null
                     : () {
@@ -75,6 +80,7 @@ class _GeneratedFormModalState extends State<GeneratedFormModal> {
                         }
                       },
                 child: Text(tr('continue')))
+            : const SizedBox.shrink()
       ],
     );
   }

lib/custom_errors.dart

@@ -13,13 +13,10 @@ class ObtainiumError {
   }
 }
 
-class RateLimitError {
+class RateLimitError extends ObtainiumError {
   late int remainingMinutes;
-  RateLimitError(this.remainingMinutes);
+  RateLimitError(this.remainingMinutes)
-
+      : super(plural('tooManyRequestsTryAgainInMinutes', remainingMinutes));
-  @override
-  String toString() =>
-      plural('tooManyRequestsTryAgainInMinutes', remainingMinutes);
 }
 
 class InvalidURLError extends ObtainiumError {

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.9.10';
+const String currentVersion = '0.9.13';
 const String currentReleaseTag =
     'v$currentVersion-beta'; // KEEP THIS IN SYNC WITH GITHUB RELEASES
 

lib/pages/add_app.dart

@@ -30,7 +30,7 @@ class _AddAppPageState extends State<AddAppPage> {
   AppSource? pickedSource;
   Map<String, dynamic> additionalSettings = {};
   bool additionalSettingsValid = true;
-  String? category;
+  List<String> pickedCategories = [];
 
   @override
   Widget build(BuildContext context) {
@@ -127,9 +127,7 @@ class _AddAppPageState extends State<AddAppPage> {
           if (app.additionalSettings['trackOnly'] == true) {
             app.installedVersion = app.latestVersion;
           }
-          if (category != null) {
+          app.categories = pickedCategories;
-            app.category = category;
-          }
           await appsProvider.saveApps([app]);
 
           return app;
@@ -290,7 +288,7 @@ class _AddAppPageState extends State<AddAppPage> {
                                           if (selectedUrls != null &&
                                               selectedUrls.isNotEmpty) {
                                             changeUserInput(
-                                                selectedUrls[0], true, true);
+                                                selectedUrls[0], true, false);
                                             addApp(resetUserInputAfter: true);
                                           }
                                         }).catchError((e) {
@@ -334,11 +332,8 @@ class _AddAppPageState extends State<AddAppPage> {
                                 ),
                                 CategoryEditorSelector(
                                     alignment: WrapAlignment.start,
-                                    singleSelect: true,
                                     onSelected: (categories) {
-                                      category = categories.isEmpty
+                                      pickedCategories = categories;
-                                          ? null
-                                          : categories.first;
                                     }),
                               ],
                             ),

lib/pages/app.dart

@@ -42,6 +42,106 @@ class _AppPageState extends State<AppPage> {
       getUpdate(app.app.id);
     }
     var trackOnly = app?.app.additionalSettings['trackOnly'] == true;
+
+    var infoColumn = Column(
+      mainAxisAlignment: MainAxisAlignment.center,
+      crossAxisAlignment: CrossAxisAlignment.stretch,
+      children: [
+        GestureDetector(
+            onTap: () {
+              if (app?.app.url != null) {
+                launchUrlString(app?.app.url ?? '',
+                    mode: LaunchMode.externalApplication);
+              }
+            },
+            child: Text(
+              app?.app.url ?? '',
+              textAlign: TextAlign.center,
+              style: const TextStyle(
+                  decoration: TextDecoration.underline,
+                  fontStyle: FontStyle.italic,
+                  fontSize: 12),
+            )),
+        const SizedBox(
+          height: 32,
+        ),
+        Text(
+          tr('latestVersionX', args: [app?.app.latestVersion ?? tr('unknown')]),
+          textAlign: TextAlign.center,
+          style: Theme.of(context).textTheme.bodyLarge,
+        ),
+        Text(
+          '${tr('installedVersionX', args: [
+                app?.app.installedVersion ?? tr('none')
+              ])}${trackOnly ? ' ${tr('estimateInBrackets')}\n\n${tr('xIsTrackOnly', args: [
+                  tr('app')
+                ])}' : ''}',
+          textAlign: TextAlign.center,
+          style: Theme.of(context).textTheme.bodyLarge,
+        ),
+        const SizedBox(
+          height: 32,
+        ),
+        Text(
+          tr('lastUpdateCheckX', args: [
+            app?.app.lastUpdateCheck == null
+                ? tr('never')
+                : '\n${app?.app.lastUpdateCheck?.toLocal()}'
+          ]),
+          textAlign: TextAlign.center,
+          style: const TextStyle(fontStyle: FontStyle.italic, fontSize: 12),
+        ),
+        const SizedBox(
+          height: 48,
+        ),
+        CategoryEditorSelector(
+            alignment: WrapAlignment.center,
+            preselected:
+                app?.app.categories != null ? app!.app.categories.toSet() : {},
+            onSelected: (categories) {
+              if (app != null) {
+                app.app.categories = categories;
+                appsProvider.saveApps([app.app]);
+              }
+            }),
+      ],
+    );
+
+    var fullInfoColumn = Column(
+      mainAxisAlignment: MainAxisAlignment.center,
+      crossAxisAlignment: CrossAxisAlignment.stretch,
+      children: [
+        const SizedBox(height: 150),
+        app?.installedInfo != null
+            ? Row(mainAxisAlignment: MainAxisAlignment.center, children: [
+                Image.memory(
+                  app!.installedInfo!.icon!,
+                  height: 150,
+                  gaplessPlayback: true,
+                )
+              ])
+            : Container(),
+        const SizedBox(
+          height: 25,
+        ),
+        Text(
+          app?.installedInfo?.name ?? app?.app.name ?? tr('app'),
+          textAlign: TextAlign.center,
+          style: Theme.of(context).textTheme.displayLarge,
+        ),
+        Text(
+          tr('byX', args: [app?.app.author ?? tr('unknown')]),
+          textAlign: TextAlign.center,
+          style: Theme.of(context).textTheme.headlineMedium,
+        ),
+        const SizedBox(
+          height: 32,
+        ),
+        infoColumn,
+        const SizedBox(height: 150)
+      ],
+    );
+
     return Scaffold(
       appBar: settingsProvider.showAppWebpage ? AppBar() : null,
       backgroundColor: Theme.of(context).colorScheme.surface,
@@ -71,106 +171,7 @@ class _AppPageState extends State<AppPage> {
               : CustomScrollView(
                   slivers: [
                     SliverToBoxAdapter(
-                        child: Column(
+                        child: Column(children: [fullInfoColumn])),
-                      mainAxisAlignment: MainAxisAlignment.center,
-                      crossAxisAlignment: CrossAxisAlignment.stretch,
-                      children: [
-                        const SizedBox(height: 150),
-                        app?.installedInfo != null
-                            ? Row(
-                                mainAxisAlignment: MainAxisAlignment.center,
-                                children: [
-                                    Image.memory(
-                                      app!.installedInfo!.icon!,
-                                      height: 150,
-                                      gaplessPlayback: true,
-                                    )
-                                  ])
-                            : Container(),
-                        const SizedBox(
-                          height: 25,
-                        ),
-                        Text(
-                          app?.installedInfo?.name ??
-                              app?.app.name ??
-                              tr('app'),
-                          textAlign: TextAlign.center,
-                          style: Theme.of(context).textTheme.displayLarge,
-                        ),
-                        Text(
-                          tr('byX', args: [app?.app.author ?? tr('unknown')]),
-                          textAlign: TextAlign.center,
-                          style: Theme.of(context).textTheme.headlineMedium,
-                        ),
-                        const SizedBox(
-                          height: 32,
-                        ),
-                        GestureDetector(
-                            onTap: () {
-                              if (app?.app.url != null) {
-                                launchUrlString(app?.app.url ?? '',
-                                    mode: LaunchMode.externalApplication);
-                              }
-                            },
-                            child: Text(
-                              app?.app.url ?? '',
-                              textAlign: TextAlign.center,
-                              style: const TextStyle(
-                                  decoration: TextDecoration.underline,
-                                  fontStyle: FontStyle.italic,
-                                  fontSize: 12),
-                            )),
-                        const SizedBox(
-                          height: 32,
-                        ),
-                        Text(
-                          tr('latestVersionX',
-                              args: [app?.app.latestVersion ?? tr('unknown')]),
-                          textAlign: TextAlign.center,
-                          style: Theme.of(context).textTheme.bodyLarge,
-                        ),
-                        Text(
-                          '${tr('installedVersionX', args: [
-                                app?.app.installedVersion ?? tr('none')
-                              ])}${trackOnly ? ' ${tr('estimateInBrackets')}\n\n${tr('xIsTrackOnly', args: [
-                                  tr('app')
-                                ])}' : ''}',
-                          textAlign: TextAlign.center,
-                          style: Theme.of(context).textTheme.bodyLarge,
-                        ),
-                        const SizedBox(
-                          height: 32,
-                        ),
-                        Text(
-                          tr('lastUpdateCheckX', args: [
-                            app?.app.lastUpdateCheck == null
-                                ? tr('never')
-                                : '\n${app?.app.lastUpdateCheck?.toLocal()}'
-                          ]),
-                          textAlign: TextAlign.center,
-                          style: const TextStyle(
-                              fontStyle: FontStyle.italic, fontSize: 12),
-                        ),
-                        const SizedBox(
-                          height: 48,
-                        ),
-                        CategoryEditorSelector(
-                            alignment: WrapAlignment.center,
-                            singleSelect: true,
-                            preselected: app?.app.category != null
-                                ? {app!.app.category!}
-                                : {},
-                            onSelected: (categories) {
-                              if (app != null) {
-                                app.app.category = categories.isNotEmpty
-                                    ? categories[0]
-                                    : null;
-                                appsProvider.saveApps([app.app]);
-                              }
-                            }),
-                        const SizedBox(height: 150)
-                      ],
-                    )),
                   ],
                 ),
           onRefresh: () async {
@@ -289,6 +290,31 @@ class _AppPageState extends State<AppPage> {
                                     },
                               tooltip: tr('additionalOptions'),
                               icon: const Icon(Icons.settings)),
+                        if (app != null && settingsProvider.showAppWebpage)
+                          IconButton(
+                              onPressed: () {
+                                showDialog(
+                                    context: context,
+                                    builder: (BuildContext ctx) {
+                                      return AlertDialog(
+                                        scrollable: true,
+                                        content: infoColumn,
+                                        title: Text(
+                                            '${app.app.name} ${tr('byX', args: [
+                                              app.app.author
+                                            ])}'),
+                                        actions: [
+                                          TextButton(
+                                              onPressed: () {
+                                                Navigator.of(context).pop();
+                                              },
+                                              child: Text(tr('continue')))
+                                        ],
+                                      );
+                                    });
+                              },
+                              icon: const Icon(Icons.more_horiz),
+                              tooltip: tr('more')),
                         const SizedBox(width: 16.0),
                         Expanded(
                             child: ElevatedButton(

lib/pages/apps.dart

@@ -55,7 +55,8 @@ class AppsPageState extends State<AppsPage> {
     var appsProvider = context.watch<AppsProvider>();
     var settingsProvider = context.watch<SettingsProvider>();
     var sortedApps = appsProvider.apps.values.toList();
-    var currentFilterIsUpdatesOnly = filter.isIdenticalTo(updatesOnlyFilter);
+    var currentFilterIsUpdatesOnly =
+        filter.isIdenticalTo(updatesOnlyFilter, settingsProvider);
 
     selectedApps = selectedApps
         .where((element) => sortedApps.map((e) => e.app).contains(element))
@@ -102,7 +103,9 @@ class AppsPageState extends State<AppsPage> {
         }
       }
       if (filter.categoryFilter.isNotEmpty &&
-          !filter.categoryFilter.contains(app.app.category)) {
+          filter.categoryFilter
+              .intersection(app.app.categories.toSet())
+              .isEmpty) {
         return false;
       }
       return true;
@@ -224,14 +227,21 @@ class AppsPageState extends State<AppsPage> {
               String? changesUrl = SourceProvider()
                   .getSource(sortedApps[index].app.url)
                   .changeLogPageFromStandardUrl(sortedApps[index].app.url);
+              var transparent = const Color.fromARGB(0, 0, 0, 0).value;
               return Container(
                   decoration: BoxDecoration(
                       border: Border.symmetric(
                           vertical: BorderSide(
                               width: 4,
-                              color: Color(settingsProvider.categories[
+                              color: Color(
-                                      sortedApps[index].app.category] ??
+                                  sortedApps[index].app.categories.isNotEmpty
-                                  const Color.fromARGB(0, 0, 0, 0).value)))),
+                                      ? settingsProvider.categories[
+                                              sortedApps[index]
+                                                  .app
+                                                  .categories
+                                                  .first] ??
+                                          transparent
+                                      : transparent)))),
                   child: ListTile(
                     tileColor: sortedApps[index].app.pinned
                         ? Colors.grey.withOpacity(0.1)
@@ -339,6 +349,7 @@ class AppsPageState extends State<AppsPage> {
           children: [
             selectedApps.isEmpty
                 ? IconButton(
+                    visualDensity: VisualDensity.compact,
                     onPressed: () {
                       selectThese(sortedApps.map((e) => e.app).toList());
                     },
@@ -348,6 +359,8 @@ class AppsPageState extends State<AppsPage> {
                     ),
                     tooltip: tr('selectAll'))
                 : TextButton.icon(
+                    style:
+                        const ButtonStyle(visualDensity: VisualDensity.compact),
                     onPressed: () {
                       selectedApps.isEmpty
                           ? selectThese(sortedApps.map((e) => e.app).toList())
@@ -492,6 +505,75 @@ class AppsPageState extends State<AppsPage> {
                     icon: const Icon(
                       Icons.file_download_outlined,
                     )),
+                selectedApps.isEmpty
+                    ? const SizedBox()
+                    : IconButton(
+                        visualDensity: VisualDensity.compact,
+                        onPressed: () async {
+                          try {
+                            Set<String>? preselected;
+                            var showPrompt = false;
+                            for (var element in selectedApps) {
+                              var currentCats = element.categories.toSet();
+                              if (preselected == null) {
+                                preselected = currentCats;
+                              } else {
+                                if (!settingsProvider.setEqual(
+                                    currentCats, preselected)) {
+                                  showPrompt = true;
+                                  break;
+                                }
+                              }
+                            }
+                            var cont = true;
+                            if (showPrompt) {
+                              cont = await showDialog<Map<String, dynamic>?>(
+                                      context: context,
+                                      builder: (BuildContext ctx) {
+                                        return GeneratedFormModal(
+                                          title: tr('categorize'),
+                                          items: const [],
+                                          initValid: true,
+                                          message:
+                                              tr('selectedCategorizeWarning'),
+                                        );
+                                      }) !=
+                                  null;
+                            }
+                            if (cont) {
+                              await showDialog<Map<String, dynamic>?>(
+                                  context: context,
+                                  builder: (BuildContext ctx) {
+                                    return GeneratedFormModal(
+                                      title: tr('categorize'),
+                                      items: const [],
+                                      initValid: true,
+                                      singleNullReturnButton: tr('continue'),
+                                      additionalWidgets: [
+                                        CategoryEditorSelector(
+                                          preselected: !showPrompt
+                                              ? preselected ?? {}
+                                              : {},
+                                          showLabelWhenNotEmpty: false,
+                                          onSelected: (categories) {
+                                            appsProvider
+                                                .saveApps(selectedApps.map((e) {
+                                              e.categories = categories;
+                                              return e;
+                                            }).toList());
+                                          },
+                                        )
+                                      ],
+                                    );
+                                  });
+                            }
+                          } catch (err) {
+                            showError(err, context);
+                          }
+                        },
+                        tooltip: tr('categorize'),
+                        icon: const Icon(Icons.category_outlined),
+                      ),
                 selectedApps.isEmpty
                     ? const SizedBox()
                     : IconButton(
@@ -688,12 +770,15 @@ class AppsPageState extends State<AppsPage> {
             appsProvider.apps.isEmpty
                 ? const SizedBox()
                 : TextButton.icon(
+                    style:
+                        const ButtonStyle(visualDensity: VisualDensity.compact),
                     label: Text(
-                      filter.isIdenticalTo(neutralFilter)
+                      filter.isIdenticalTo(neutralFilter, settingsProvider)
                           ? tr('filter')
                           : tr('filterActive'),
                       style: TextStyle(
-                          fontWeight: filter.isIdenticalTo(neutralFilter)
+                          fontWeight: filter.isIdenticalTo(
+                                  neutralFilter, settingsProvider)
                               ? FontWeight.normal
                               : FontWeight.bold),
                     ),
@@ -785,12 +870,10 @@ class AppsFilter {
     includeNonInstalled = values['nonInstalledApps'];
   }
 
-  bool isIdenticalTo(AppsFilter other) =>
+  bool isIdenticalTo(AppsFilter other, SettingsProvider settingsProvider) =>
       authorFilter.trim() == other.authorFilter.trim() &&
       nameFilter.trim() == other.nameFilter.trim() &&
       includeUptodate == other.includeUptodate &&
       includeNonInstalled == other.includeNonInstalled &&
-      categoryFilter.length == other.categoryFilter.length &&
+      settingsProvider.setEqual(categoryFilter, other.categoryFilter);
-      categoryFilter.union(other.categoryFilter).length ==
-          categoryFilter.length;
 }

lib/pages/settings.dart

@@ -436,7 +436,7 @@ class _CategoryEditorSelectorState extends State<CategoryEditorSelector> {
         items: [
           [
             GeneratedFormTagInput('categories',
-                label: tr('category'),
+                label: tr('categories'),
                 emptyMessage: tr('noCategories'),
                 defaultValue: storedValues,
                 alignment: widget.alignment,

lib/providers/settings_provider.dart

@@ -157,15 +157,6 @@ class SettingsProvider with ChangeNotifier {
     notifyListeners();
   }
 
-  getCategoryFormItem({String initCategory = ''}) => GeneratedFormDropdown(
-      'category',
-      label: tr('category'),
-      [
-        MapEntry('', tr('noCategory')),
-        ...categories.entries.map((e) => MapEntry(e.key, e.key)).toList()
-      ],
-      defaultValue: initCategory);
-
   String? get forcedLocale {
     var fl = prefs?.getString('forcedLocale');
     return supportedLocales
@@ -185,4 +176,7 @@ class SettingsProvider with ChangeNotifier {
     }
     notifyListeners();
   }
+
+  bool setEqual(Set<String> a, Set<String> b) =>
+      a.length == b.length && a.union(b).length == a.length;
 }

lib/providers/source_provider.dart

@@ -48,7 +48,7 @@ class App {
   late Map<String, dynamic> additionalSettings;
   late DateTime? lastUpdateCheck;
   bool pinned = false;
-  String? category;
+  List<String> categories;
   App(
       this.id,
       this.url,
@@ -61,7 +61,7 @@ class App {
       this.additionalSettings,
       this.lastUpdateCheck,
       this.pinned,
-      {this.category});
+      {this.categories = const []});
 
   @override
   String toString() {
@@ -103,6 +103,12 @@ class App {
             item.ensureType(additionalSettings[item.key]);
       }
     }
+    int preferredApkIndex = json['preferredApkIndex'] == null
+        ? 0
+        : json['preferredApkIndex'] as int;
+    if (preferredApkIndex < 0) {
+      preferredApkIndex = 0;
+    }
     return App(
         json['id'] as String,
         json['url'] as String,
@@ -115,15 +121,19 @@ class App {
         json['apkUrls'] == null
             ? []
             : List<String>.from(jsonDecode(json['apkUrls'])),
-        json['preferredApkIndex'] == null
+        preferredApkIndex,
-            ? 0
-            : json['preferredApkIndex'] as int,
         additionalSettings,
         json['lastUpdateCheck'] == null
             ? null
             : DateTime.fromMicrosecondsSinceEpoch(json['lastUpdateCheck']),
         json['pinned'] ?? false,
-        category: json['category']);
+        categories: json['categories'] != null
+            ? (json['categories'] as List<dynamic>)
+                .map((e) => e.toString())
+                .toList()
+            : json['category'] != null
+                ? [json['category'] as String]
+                : []);
   }
 
   Map<String, dynamic> toJson() => {
@@ -138,7 +148,7 @@ class App {
         'additionalSettings': jsonEncode(additionalSettings),
         'lastUpdateCheck': lastUpdateCheck?.microsecondsSinceEpoch,
         'pinned': pinned,
-        'category': category
+        'categories': categories
       };
 }
 
@@ -360,11 +370,11 @@ class SourceProvider {
         currentApp?.installedVersion,
         apkVersion,
         apk.apkUrls,
-        apk.apkUrls.length - 1,
+        apk.apkUrls.length - 1 >= 0 ? apk.apkUrls.length - 1 : 0,
         additionalSettings,
         DateTime.now(),
         currentApp?.pinned ?? false,
-        category: currentApp?.category);
+        categories: currentApp?.categories ?? const []);
   }
 
   // Returns errors in [results, errors] instead of throwing them

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.9.10+98 # When changing this, update the tag in main() accordingly
+version: 0.9.13+103 # When changing this, update the tag in main() accordingly
 
 environment:
   sdk: '>=2.18.2 <3.0.0'