Merge pull request #712 from ImranR98/dev

Auto retry failed download (3 times) (#634)

assets/translations/hu.json

@@ -236,9 +236,9 @@
     "removeOnExternalUninstall": "A külsőleg eltávolított appok auto. eltávolítása",
     "pickHighestVersionCode": "A legmagasabb verziószámú APK auto. kiválasztása",
     "checkUpdateOnDetailPage": "Frissítések keresése az app részleteit tartalmazó oldal megnyitásakor",
-    "disablePageTransitions": "Disable page transition animations",
-    "reversePageTransitions": "Reverse page transition animations",
-    "minStarCount": "Minimum Star Count",
+    "disablePageTransitions": "Lap áttűnési animációk tiltása",
+    "reversePageTransitions": "Fordított lap áttűnési animációk",
+    "minStarCount": "Minimális csillag szám",
     "removeAppQuestion": {
         "one": "Eltávolítja az alkalmazást?",
         "other": "Eltávolítja az alkalmazást?"

assets/translations/ru.json

@@ -239,7 +239,7 @@
     "checkUpdateOnDetailPage": "Проверять наличие обновлений при открытии страницы представления приложения",
     "disablePageTransitions": "Отключить анимацию перехода между страницами",
     "reversePageTransitions": "Реверс анимации перехода между страницами",
-    "minStarCount": "Minimum Star Count",
+    "minStarCount": "Минимальное количество звёзд",
     "removeAppQuestion": {
         "one": "Удалить приложение?",
         "other": "Удалить приложения?"

assets/translations/zh.json

@@ -234,12 +234,12 @@
     "requiresCredentialsInSettings": "此功能需要额外的凭据（在“设置”中添加）",
     "checkOnStart": "启动时进行一次检查",
     "tryInferAppIdFromCode": "尝试从源代码推断应用 ID",
-    "removeOnExternalUninstall": "Automatically remove externally uninstalled Apps",
-    "pickHighestVersionCode": "Auto-select highest version code APK",
-    "checkUpdateOnDetailPage": "Check for updates on opening an App detail page",
-    "disablePageTransitions": "Disable page transition animations",
-    "reversePageTransitions": "Reverse page transition animations",
-    "minStarCount": "Minimum Star Count",
+    "removeOnExternalUninstall": "自动删除已卸载的外部应用",
+    "pickHighestVersionCode": "自动选择版本号最高的 APK 文件",
+    "checkUpdateOnDetailPage": "打开应用详情页时检查更新",
+    "disablePageTransitions": "禁用页面过渡动画效果",
+    "reversePageTransitions": "反转页面过渡动画效果",
+    "minStarCount": "最小星标数",
     "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.13.19';
+const String currentVersion = '0.13.21';
 const String currentReleaseTag =
     'v$currentVersion-beta'; // KEEP THIS IN SYNC WITH GITHUB RELEASES
 

lib/providers/apps_provider.dart

@@ -144,6 +144,24 @@ class AppsProvider with ChangeNotifier {
     }();
   }
 
+  Future<File> downloadFileWithRetry(
+      String url, String fileNameNoExt, Function? onProgress,
+      {bool useExisting = true,
+      Map<String, String>? headers,
+      int retries = 3}) async {
+    try {
+      return await downloadFile(url, fileNameNoExt, onProgress,
+          useExisting: useExisting, headers: headers);
+    } catch (e) {
+      if (retries > 0 && e is ClientException) {
+        return await downloadFileWithRetry(url, fileNameNoExt, onProgress,
+            useExisting: useExisting, headers: headers, retries: (retries - 1));
+      } else {
+        rethrow;
+      }
+    }
+  }
+
   Future<File> downloadFile(
       String url, String fileNameNoExt, Function? onProgress,
       {bool useExisting = true, Map<String, String>? headers}) async {
@@ -236,8 +254,9 @@ class AppsProvider with ChangeNotifier {
       notificationsProvider?.cancel(notif.id);
       int? prevProg;
       var fileNameNoExt = '${app.id}-${downloadUrl.hashCode}';
-      var downloadedFile = await downloadFile(downloadUrl, fileNameNoExt,
-          headers: source.requestHeaders, (double? progress) {
+      var downloadedFile = await downloadFileWithRetry(
+          downloadUrl, fileNameNoExt, headers: source.requestHeaders,
+          (double? progress) {
         int? prog = progress?.ceil();
         if (apps[app.id] != null) {
           apps[app.id]!.downloadProgress = progress;

lib/providers/source_provider.dart

@@ -449,8 +449,11 @@ abstract class AppSource {
 }
 
 ObtainiumError getObtainiumHttpError(Response res) {
-  return ObtainiumError(res.reasonPhrase ??
-      tr('errorWithHttpStatusCode', args: [res.statusCode.toString()]));
+  return ObtainiumError((res.reasonPhrase != null &&
+          res.reasonPhrase != null &&
+          res.reasonPhrase!.isNotEmpty)
+      ? res.reasonPhrase!
+      : tr('errorWithHttpStatusCode', args: [res.statusCode.toString()]));
 }
 
 abstract class MassAppUrlSource {

pubspec.lock

@@ -222,10 +222,10 @@ packages:
     dependency: "direct main"
     description:
       name: file_picker
-      sha256: b1729fc96627dd44012d0a901558177418818d6bd428df59dcfeb594e5f66432
+      sha256: "21145c9c268d54b1f771d8380c195d2d6f655e0567dc1ca2f9c134c02c819e0a"
       url: "https://pub.dev"
     source: hosted
-    version: "5.3.2"
+    version: "5.3.3"
   flutter:
     dependency: "direct main"
     description: flutter

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.13.19+183 # When changing this, update the tag in main() accordingly
+version: 0.13.21+185 # When changing this, update the tag in main() accordingly
 
 environment:
   sdk: '>=2.18.2 <3.0.0'