Merge pull request #1619 from ImranR98/dev

- Bugfix: Get initial data on config import - Bugfix: Include overrideSource in exported config
Increment version, update packages
2025-07-16 06:36:44 +02:00 · 2024-05-12 20:47:51 -04:00 · 2024-05-12 20:47:06 -04:00 · 2024-05-12 20:45:34 -04:00 · 2024-05-12 20:45:21 -04:00 · 2024-05-12 20:45:04 -04:00
10 changed files with 90 additions and 56 deletions
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@ -6,7 +6,8 @@
        android:name="${applicationName}"
        android:icon="@mipmap/ic_launcher"
        android:requestLegacyExternalStorage="true"
-        android:usesCleartextTraffic="true">
+        android:usesCleartextTraffic="true"
+        android:localeConfig="@xml/locales_config">
        <activity
            android:name=".MainActivity"
            android:exported="true"
--- a/android/app/src/main/res/xml/locales_config.xml
+++ b/android/app/src/main/res/xml/locales_config.xml
@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<locale-config xmlns:android="http://schemas.android.com/apk/res/android">
+    <locale android:name="bs"/>
+    <locale android:name="cs"/>
+    <locale android:name="de"/>
+    <locale android:name="en"/>
+    <locale android:name="es"/>
+    <locale android:name="fa"/>
+    <locale android:name="fr"/>
+    <locale android:name="hu"/>
+    <locale android:name="it"/>
+    <locale android:name="ja"/>
+    <locale android:name="nl"/>
+    <locale android:name="pl"/>
+    <locale android:name="pt"/>
+    <locale android:name="ru"/>
+    <locale android:name="sv"/>
+    <locale android:name="tr"/>
+    <locale android:name="uk"/>
+    <locale android:name="vi"/>
+    <locale android:name="zh"/>
+</locale-config>
--- a/assets/translations/ru.json
+++ b/assets/translations/ru.json
@ -9,7 +9,7 @@
    "placeholder": "Заполнитель",
    "someErrors": "Возникли некоторые ошибки",
    "unexpectedError": "Неожиданная ошибка",
-    "ok": "Ok",
+    "ok": "Ок",
    "and": "и",
    "githubPATLabel": "Персональный токен доступа GitHub\n(увеличивает лимит запросов)",
    "includePrereleases": "Включить предварительные релизы",
@ -135,7 +135,7 @@
    "close": "Закрыть",
    "share": "Поделиться",
    "appNotFound": "Приложение не найдено",
-    "obtainiumExportHyphenatedLowercase": "получение-экспорт",
+    "obtainiumExportHyphenatedLowercase": "экспорт-obtainium",
    "pickAnAPK": "Выберите APK-файл",
    "appHasMoreThanOnePackage": "{} имеет более одного пакета:",
    "deviceSupportsXArch": "Ваше устройство поддерживает архитектуру процессора {}",
@ -179,8 +179,8 @@
    "appWithIdOrNameNotFound": "Приложение с таким ID или названием не было найдено",
    "reposHaveMultipleApps": "В хранилище несколько приложений",
    "fdroidThirdPartyRepo": "Сторонние репозитории F-Droid",
-    "steamMobile": "Стим Мобайл",
-    "steamChat": "Стим-чат",
+    "steamMobile": "Приложение Steam",
+    "steamChat": "Steam Chat",
    "install": "Установить",
    "markInstalled": "Пометить как установленное",
    "update": "Обновить",
@ -191,7 +191,7 @@
    "downloadingX": "Загрузка {}",
    "downloadX": "Скачать {}",
    "downloadedX": "Загружено {}",
-    "releaseAsset": "Освобождение актива",
+    "releaseAsset": "Релизный объект",
    "downloadNotifDescription": "Уведомляет пользователя о прогрессе загрузки приложения",
    "noAPKFound": "APK не найден",
    "noVersionDetection": "Обнаружение версий отключено",
@ -254,7 +254,7 @@
    "intermediateLinkRegex": "Фильтр для \"промежуточной\" ссылки для посещения",
    "filterByLinkText": "Фильтрация ссылок по тексту ссылки",
    "intermediateLinkNotFound": "Промежуточная ссылка не найдена",
-    "intermediateLink": "Промежуточное звено",
+    "intermediateLink": "Промежуточная ссылка",
    "exemptFromBackgroundUpdates": "Исключить из фоновых обновлений (если включено)",
    "bgUpdatesOnWiFiOnly": "Отключить фоновые обновления, если нет соединения с Wi-Fi",
    "autoSelectHighestVersionCode": "Автоматически выбирать APK с актуальной версией кода",
--- a/assets/translations/zh.json
+++ b/assets/translations/zh.json
@ -24,7 +24,7 @@
    "colour": "配色",
    "standard": "标准",
    "custom": "定制",
-    "useMaterialYou": "使用 Material You 配色",
+    "useMaterialYou": "使用 Material You",
    "githubStarredRepos": "已星标的 GitHub 仓库",
    "uname": "用户名",
    "wrongArgNum": "参数数量错误",
@ -45,8 +45,8 @@
    "search": "搜索",
    "additionalOptsFor": "{} 的更多选项",
    "supportedSources": "支持的来源",
-    "trackOnlyInBrackets": "(仅追踪)",
-    "searchableInBrackets": "(可搜索)",
+    "trackOnlyInBrackets": "（仅追踪）",
+    "searchableInBrackets": "（可搜索）",
    "appsString": "应用列表",
    "noApps": "无应用",
    "noAppsForFilter": "没有符合条件的应用",
@ -125,7 +125,7 @@
    "bgUpdateCheckInterval": "后台更新检查间隔",
    "neverManualOnly": "手动",
    "appearance": "外观",
-    "showWebInAppView": "应用详情页显示来源网页",
+    "showWebInAppView": "应用详情页显示来源网站内容",
    "pinUpdates": "将待更新应用置顶",
    "updates": "更新",
    "sourceSpecific": "来源",
@ -147,7 +147,7 @@
    "noNewUpdates": "全部应用已是最新。",
    "xHasAnUpdate": "“{}”可以更新了。",
    "appsUpdated": "应用已更新",
-    "appsNotUpdated": "更新应用程序失败",
+    "appsNotUpdated": "更新应用失败",
    "appsUpdatedNotifDescription": "当应用在后台安装更新时发送通知",
    "xWasUpdatedToY": "“{}”已更新至 {}。",
    "xWasNotUpdatedToY": "未能将 {} 更新为 {}。",
@ -191,7 +191,7 @@
    "downloadingX": "正在下载“{}”",
    "downloadX": "下载 {}",
    "downloadedX": "下载 {}",
-    "releaseAsset": "APK 文件",
+    "releaseAsset": "发行版附件",
    "downloadNotifDescription": "提示应用的下载进度",
    "noAPKFound": "未找到 APK 文件",
    "noVersionDetection": "禁用版本检测",
@ -201,7 +201,7 @@
    "noCategory": "无类别",
    "noCategories": "无类别",
    "deleteCategoriesQuestion": "是否删除选中的类别？",
-    "categoryDeleteWarning": "被删除类别下的应用将恢复为未分类状态。",
+    "categoryDeleteWarning": "被删除类别的应用将恢复为未分类状态。",
    "addCategory": "添加类别",
    "label": "标签",
    "language": "语言",
@ -247,7 +247,7 @@
    "appsPossiblyUpdated": "已尝试更新应用",
    "appsPossiblyUpdatedNotifDescription": "当应用已尝试在后台更新时发送通知",
    "xWasPossiblyUpdatedToY": "已尝试将“{}”更新至 {}。",
-    "enableBackgroundUpdates": "启用后台更新",
+    "enableBackgroundUpdates": "启用全局后台更新",
    "backgroundUpdateReqsExplanation": "后台更新未必适用于所有的应用。",
    "backgroundUpdateLimitsExplanation": "只有在启动 Obtainium 时才能确认安装是否成功。",
    "verifyLatestTag": "验证“Latest”标签",
@ -255,12 +255,12 @@
    "filterByLinkText": "根据链接文本进行筛选",
    "intermediateLinkNotFound": "未找到中转链接",
    "intermediateLink": "中转链接",
-    "exemptFromBackgroundUpdates": "禁用后台更新（如果已经全局启用）",
+    "exemptFromBackgroundUpdates": "禁用后台更新（仅此应用生效，即使已启用全局后台更新）",
    "bgUpdatesOnWiFiOnly": "未连接 Wi-Fi 时禁用后台更新",
    "autoSelectHighestVersionCode": "自动选择内部版本号最高的 APK 文件",
    "versionExtractionRegEx": "提取版本号的正则表达式",
    "matchGroupToUse": "从上述匹配结果中引用的捕获组",
-    "highlightTouchTargets": "突出展示不明显的触摸区域",
+    "highlightTouchTargets": "突出展示不明显的可交互区域",
    "pickExportDir": "选择导出文件夹",
    "autoExportOnChanges": "数据变更时自动导出",
    "includeSettings": "同时导出应用设置",
@ -291,12 +291,12 @@
    "useShizuku": "使用 Shizuku 或 Sui 安装",
    "shizukuBinderNotFound": "未发现兼容的 Shizuku 服务",
    "shizukuOld": "Shizuku 版本过低（<11）- 请更新",
-    "shizukuOldAndroidWithADB": "正在低版本 Android（<8.1）系统中以 ADB 模式运行 Shizuku - 请更新 Android 版本或使用 Sui 代替",
-    "shizukuPretendToBeGooglePlay": "使用 Shizuku 时，将安装来源伪装为“Google Play”",
+    "shizukuOldAndroidWithADB": "正在低版本 Android（<8.1）系统中以 ADB 模式运行 Shizuku - 请更新 Android 系统版本或使用 Sui 代替",
+    "shizukuPretendToBeGooglePlay": "将安装来源伪装为 Google Play（需要使用 Shizuku）",
    "useSystemFont": "使用系统字体",
    "useVersionCodeAsOSVersion": "使用内部版本号代替应用定义的版本号",
    "requestHeader": "请求标头",
-    "useLatestAssetDateAsReleaseDate": "使用最近文件上传时间作为发行日期",
+    "useLatestAssetDateAsReleaseDate": "使用最新文件上传时间作为发行日期",
    "defaultPseudoVersioningMethod": "默认虚拟版本方案",
    "partialAPKHash": "APK 文件散列值片段",
    "APKLinkHash": "APK 文件链接散列值",
@ -310,19 +310,19 @@
    "badDownload": "无法解析 APK 文件（不兼容或文件不完整）",
    "beforeNewInstallsShareToAppVerifier": "通过 AppVerifier 校验新应用（如果可用）",
    "appVerifierInstructionToast": "分享至 AppVerifier，完成后返回此处。",
-    "wiki": "帮助/维基",
+    "wiki": "帮助/Wiki",
    "crowdsourcedConfigsLabel": "众包应用程序配置（使用风险自负）",
    "removeAppQuestion": {
        "one": "是否删除应用？",
        "other": "是否删除应用？"
    },
    "tooManyRequestsTryAgainInMinutes": {
-        "one": "API 请求过于频繁（速率限制）- 在 {} 分钟后重试",
-        "other": "API 请求过于频繁（速率限制）- 在 {} 分钟后重试"
+        "one": "API 请求过于频繁（速率限制）- 请在 {} 分钟后重试",
+        "other": "API 请求过于频繁（速率限制）- 请在 {} 分钟后重试"
    },
    "bgUpdateGotErrorRetryInMinutes": {
-        "one": "后台更新检查遇到了“{}”问题，预定于 {} 分钟后重试",
-        "other": "后台更新检查遇到了“{}”问题，预定于 {} 分钟后重试"
+        "one": "后台更新检查遇到了“{}”问题，将于 {} 分钟后重试",
+        "other": "后台更新检查遇到了“{}”问题，将于 {} 分钟后重试"
    },
    "bgCheckFoundUpdatesWillNotifyIfNeeded": {
        "one": "后台检查发现 {} 个应用更新 - 如有需要将发送通知",
@ -361,8 +361,8 @@
        "other": "“{}”和另外 {} 个应用已更新。"
    },
    "xAndNMoreUpdatesFailed": {
-        "one": "更新 {} 和另外 1 个应用程序失败。",
-        "other": "未能更新 {} 和 {} 更多应用程序。"
+        "one": "{} 和另外 1 个应用更新失败。",
+        "other": "{} 和另外 {} 个应用更新失败。"
    },
    "xAndNMoreUpdatesPossiblyInstalled": {
        "one": "{} 和另外 1 个应用已尝试更新。",
@ -372,4 +372,4 @@
        "one": "{}APK",
        "other": "{}APK"
    }
-}
+}
--- a/lib/pages/apps.dart
+++ b/lib/pages/apps.dart
@ -893,7 +893,8 @@ class AppsPageState extends State<AppsPage> {
                                          'preferredApkIndex':
                                              a.preferredApkIndex,
                                          'additionalSettings':
-                                              jsonEncode(a.additionalSettings)
+                                              jsonEncode(a.additionalSettings),
+                                          'overrideSource': a.overrideSource
                                        }))}\n\n';
                                  }
                                  Share.share(urls,
--- a/lib/pages/home.dart
+++ b/lib/pages/home.dart
@ -13,6 +13,7 @@ import 'package:obtainium/pages/import_export.dart';
 import 'package:obtainium/pages/settings.dart';
 import 'package:obtainium/providers/apps_provider.dart';
 import 'package:obtainium/providers/settings_provider.dart';
+import 'package:obtainium/providers/source_provider.dart';
 import 'package:provider/provider.dart';

 class HomePage extends StatefulWidget {
@ -102,13 +103,22 @@ class _HomePageState extends State<HomePage> {
                  }) !=
              null) {
            // ignore: use_build_context_synchronously
-            var result = await context.read<AppsProvider>().import(
-                action == 'app'
-                    ? '{ "apps": [$dataStr] }'
-                    : '{ "apps": $dataStr }');
+            var appsProvider = await context.read<AppsProvider>();
+            var result = await appsProvider.import(action == 'app'
+                ? '{ "apps": [$dataStr] }'
+                : '{ "apps": $dataStr }');
            // ignore: use_build_context_synchronously
            showMessage(
-                tr('importedX', args: [plural('apps', result.key)]), context);
+                tr('importedX', args: [plural('apps', result.key.length)]),
+                context);
+            await appsProvider
+                .checkUpdates(specificIds: result.key.map((e) => e.id).toList())
+                .catchError((e) {
+              if (e is Map && e['errors'] is MultiAppMultiError) {
+                showError(e['errors'].toString(), context);
+              }
+              return <App>[];
+            });
          }
        } else {
          throw ObtainiumError(tr('unknown'));
--- a/lib/pages/import_export.dart
+++ b/lib/pages/import_export.dart
@ -144,7 +144,7 @@ class _ImportExportPageState extends State<ImportExportPage> {
            appsProvider.addMissingCategories(settingsProvider);
            showMessage(
                '${tr('importedX', args: [
-                      plural('apps', value.key)
+                      plural('apps', value.key.length)
                    ])}${value.value ? ' + ${tr('settings')}' : ''}',
                context);
          });
--- a/lib/providers/apps_provider.dart
+++ b/lib/providers/apps_provider.dart
@ -1516,7 +1516,7 @@ class AppsProvider with ChangeNotifier {
    return returnPath;
  }

-  Future<MapEntry<int, bool>> import(String appsJSON) async {
+  Future<MapEntry<List<App>, bool>> import(String appsJSON) async {
    var decodedJSON = jsonDecode(appsJSON);
    var newFormat = decodedJSON is! List;
    List<App> importedApps =
@ -1550,8 +1550,8 @@ class AppsProvider with ChangeNotifier {
        }
      });
    }
-    return MapEntry<int, bool>(
-        importedApps.length, newFormat && decodedJSON['settings'] != null);
+    return MapEntry<List<App>, bool>(
+        importedApps, newFormat && decodedJSON['settings'] != null);
  }

  @override
--- a/pubspec.lock
+++ b/pubspec.lock
@ -215,10 +215,10 @@ packages:
    dependency: "direct main"
    description:
      name: easy_localization
-      sha256: "432698c31a488dd64c56d4759f20d04844baba5e9e4f2cb1abb9676257918b17"
+      sha256: fa59bcdbbb911a764aa6acf96bbb6fa7a5cf8234354fc45ec1a43a0349ef0201
      url: "https://pub.dev"
    source: hosted
-    version: "3.0.6"
+    version: "3.0.7"
  easy_logger:
    dependency: transitive
    description:
@ -324,18 +324,18 @@ packages:
    dependency: "direct dev"
    description:
      name: flutter_lints
-      sha256: "9e8c3858111da373efc5aa341de011d9bd23e2c5c5e0c62bccf32438e192d7b1"
+      sha256: "3f41d009ba7172d5ff9be5f6e6e6abb4300e263aab8866d2a0842ed2a70f8f0c"
      url: "https://pub.dev"
    source: hosted
-    version: "3.0.2"
+    version: "4.0.0"
  flutter_local_notifications:
    dependency: "direct main"
    description:
      name: flutter_local_notifications
-      sha256: "84a3af6c7fb43c85c3528b434dacc7a7ed4551d1209d93773bf6045cec9ace68"
+      sha256: "40e6fbd2da7dcc7ed78432c5cdab1559674b4af035fddbfb2f9a8f9c2112fcef"
      url: "https://pub.dev"
    source: hosted
-    version: "17.1.1"
+    version: "17.1.2"
  flutter_local_notifications_linux:
    dependency: transitive
    description:
@ -491,10 +491,10 @@ packages:
    dependency: transitive
    description:
      name: lints
-      sha256: cbf8d4b858bb0134ef3ef87841abdf8d63bfc255c266b7bf6b39daa1085c4290
+      sha256: "976c774dd944a42e83e2467f4cc670daef7eed6295b10b36ae8c85bcbf828235"
      url: "https://pub.dev"
    source: hosted
-    version: "3.0.0"
+    version: "4.0.0"
  markdown:
    dependency: transitive
    description:
@ -579,10 +579,10 @@ packages:
    dependency: transitive
    description:
      name: path_provider_foundation
-      sha256: "5a7999be66e000916500be4f15a3633ebceb8302719b47b9cc49ce924125350f"
+      sha256: f234384a3fdd67f989b4d54a5d73ca2a6c422fa55ae694381ae0f4375cd1ea16
      url: "https://pub.dev"
    source: hosted
-    version: "2.3.2"
+    version: "2.4.0"
  path_provider_linux:
    dependency: transitive
    description:
@ -723,10 +723,10 @@ packages:
    dependency: transitive
    description:
      name: shared_preferences_foundation
-      sha256: "7708d83064f38060c7b39db12aefe449cb8cdc031d6062280087bc4cdb988f5c"
+      sha256: "0a8a893bf4fd1152f93fec03a415d11c27c74454d96e2318a7ac38dd18683ab7"
      url: "https://pub.dev"
    source: hosted
-    version: "2.3.5"
+    version: "2.4.0"
  shared_preferences_linux:
    dependency: transitive
    description:
@ -897,10 +897,10 @@ packages:
    dependency: transitive
    description:
      name: url_launcher_ios
-      sha256: "9149d493b075ed740901f3ee844a38a00b33116c7c5c10d7fb27df8987fb51d5"
+      sha256: "7068716403343f6ba4969b4173cbf3b84fc768042124bc2c011e5d782b24fe89"
      url: "https://pub.dev"
    source: hosted
-    version: "6.2.5"
+    version: "6.3.0"
  url_launcher_linux:
    dependency: transitive
    description:
@ -913,10 +913,10 @@ packages:
    dependency: transitive
    description:
      name: url_launcher_macos
-      sha256: b7244901ea3cf489c5335bdacda07264a6e960b1c1b1a9f91e4bc371d9e68234
+      sha256: "9a1a42d5d2d95400c795b2914c36fdcb525870c752569438e4ebb09a2b5d90de"
      url: "https://pub.dev"
    source: hosted
-    version: "3.1.0"
+    version: "3.2.0"
  url_launcher_platform_interface:
    dependency: transitive
    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: 1.1.7+2264
+version: 1.1.8+2265

 environment:
  sdk: '>=3.0.0 <4.0.0'
@ -89,7 +89,7 @@ dev_dependencies:
  # activated in the `analysis_options.yaml` file located at the root of your
  # package. See that file for information about deactivating specific lint
  # rules and activating additional ones.
-  flutter_lints: ^3.0.0
+  flutter_lints: ^4.0.0

 flutter_launcher_icons:
  android: "ic_launcher"
Author	SHA1	Message	Date
Imran	dbcb4b3c09	Merge pull request #1619 from ImranR98/dev - Bugfix: Get initial data on config import - Bugfix: Include overrideSource in exported config	2024-05-12 20:47:51 -04:00
Imran Remtulla	b231c756e6	Increment version, update packages	2024-05-12 20:47:06 -04:00
Imran Remtulla	3cb3f7fdd4	Merge remote-tracking branch 'origin/main' into dev	2024-05-12 20:45:34 -04:00
Imran	9837e8e325	Merge pull request #1608 from ArcticFoxPro/main Update zh.json	2024-05-12 20:45:21 -04:00
Imran	73d4814f18	Merge pull request #1616 from KoolTechTricks/patch-1 Update ru.json	2024-05-12 20:45:04 -04:00
Imran	0a9219c314	Merge pull request #1618 from GitGitro/main Enable per-app language, closes #1430	2024-05-12 20:44:55 -04:00
Imran Remtulla	56c5a73d9a	Bugfix: Get initial data on config import	2024-05-12 20:41:53 -04:00
Imran Remtulla	a30e063246	Bugfix: Include overrideSource in exported config	2024-05-12 20:12:02 -04:00
GitGitro	bd26b6514a	Enable per-app language, closes #1430	2024-05-12 18:07:35 +02:00
Kool Tech Tricks	3ea8c7e888	Update ru.json Fix incorrect machine translated strings	2024-05-11 21:26:42 +05:00
有鲫雪狐	5f2ec5ce6f	Update zh.json	2024-05-07 08:12:17 +08:00
ArcticFoxPro	783ce9d555	Update zh.json `trackOnlyInBrackets`、`searchableInBrackets`：更正半角标点为全角 `enableBackgroundUpdates`：改为“启用全局后台更新”突出全局性 `exemptFromBackgroundUpdates`：“仅此应用生效，即使已启用全局后台更新”更明确了选项条件 `shizukuPretendToBeGooglePlay`：Google Play 不是确定的字符串，在这里指代了 Play Store 实体，无需双引号。 `useLatestAssetDateAsReleaseDate`：英文 Latest 通常在简体中文对应“最新”而非“最近”。	2024-05-06 19:12:38 +08:00
ArcticFoxPro	a719b2475b	Update zh.json	2024-05-06 13:21:08 +08:00