Merge pull request #13 from MarsadMaqsood/main

Improved File Download Functionality and Bug Fixes

.gitignore

@@ -33,6 +33,7 @@ migrate_working_dir/
 /build/
 # If you're building an application, you may want to check-in your pubspec.lock
 pubspec.lock
+*.env
 
 # Symbolication related
 app.*.symbols

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.2.3
+- Updated packages to the latest version
+- Bug fixes
+
 ## 0.2.2
 - Updated packages to the latest version
 

README.md

@@ -5,7 +5,7 @@ A package to check for the custom in-app updates for Flutter.
 ## ⭐ Installing
 ```
 dependencies:
-    updater: ^0.2.1
+    updater: ^0.2.3
 ```
 
 ## ⚡ Import 

example/.gitignore

@@ -30,6 +30,7 @@
 .pub-cache/
 .pub/
 /build/
+*.env
 
 # Web related
 lib/generated_plugin_registrant.dart

example/android/app/build.gradle

@@ -44,7 +44,7 @@ android {
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "com.marsad.updater_example"
-        minSdkVersion 16
+        minSdkVersion 19
         targetSdkVersion 33
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName

example/android/build.gradle

@@ -24,6 +24,6 @@ subprojects {
     project.evaluationDependsOn(':app')
 }
 
-task clean(type: Delete) {
+tasks.register("clean", Delete) {
     delete rootProject.buildDir
 }

example/lib/main.dart

@@ -96,7 +96,7 @@ class _MyAppState extends State<MyApp> {
       url: 'https://codingwithmarsad.web.app/updater.json',
       titleText: 'Stay with time',
       // backgroundDownload: false,
-      allowSkip: true,
+      allowSkip: false,
       contentText:
           'Update your app to the latest version to enjoy new feature.',
       callBack: (UpdateModel model) {

example/pubspec.lock

@@ -45,10 +45,10 @@ packages:
     dependency: transitive
     description:
       name: dio
-      sha256: b99b1d56dc0d5dece70957023af002dbd49614b4a1bf86d3a254af3fe781bdf2
+      sha256: a9d76e72985d7087eb7c5e7903224ae52b337131518d127c554b9405936752b8
       url: "https://pub.dev"
     source: hosted
-    version: "5.2.0+1"
+    version: "5.2.1+1"
   fake_async:
     dependency: transitive
     description:
@@ -100,10 +100,10 @@ packages:
     dependency: transitive
     description:
       name: http
-      sha256: "4c3f04bfb64d3efd508d06b41b825542f08122d30bda4933fb95c069d22a4fa3"
+      sha256: "759d1a329847dd0f39226c688d3e06a6b8679668e350e2891a6474f8b4bb8525"
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.0"
+    version: "1.1.0"
   http_parser:
     dependency: transitive
     description:
@@ -323,7 +323,7 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "0.2.2"
+    version: "0.2.3"
   vector_math:
     dependency: transitive
     description:

lib/src/api_task.dart

@@ -1,17 +1,16 @@
 import 'package:dio/dio.dart';
-import 'package:flutter/material.dart';
+import 'package:flutter/foundation.dart';
 
 class APITask {
   static final APITask _instance = APITask._internal();
+  late Dio _dio;
 
   APITask._internal() {
     _dio = Dio();
   }
 
   factory APITask() => _instance;
 
-  late Dio _dio;
-
   Future<Response<T>> get<T>(String url) async {
     return await _dio.get<T>(url);
   }

lib/src/download_core.dart

@@ -31,10 +31,9 @@ class DownloadCore {
     required this.dismiss,
   });
 
-  bool _isUpdated = false;
   bool _isDisposed = false;
 
-  Future<void> startDownload({isResumed = false}) async {
+  Future<void> startDownload({bool isResumed = false}) async {
     Directory tempDirectory = await directory();
 
     List<FileSystemEntity> listEntity = tempDirectory.listSync();
@@ -47,27 +46,22 @@ class DownloadCore {
       totalLength = '${int.parse(totalLength) - 1}';
     }
 
-    if (!isResumed) {
+    if (isResumed) {
+      for (FileSystemEntity entity in listEntity) {
+        File file = File(entity.path);
+        downloadedLength += file.lengthSync();
+      }
+    } else {
       for (FileSystemEntity entity in listEntity) {
         File file = File(entity.path);
         file.deleteSync();
       }
     }
 
-    listEntity = tempDirectory.listSync();
-
-    for (FileSystemEntity entity in listEntity) {
-      File file = File(entity.path);
-      downloadedLength = downloadedLength + file.lengthSync();
-    }
-
-    int index = 0;
-
-    if (listEntity.isNotEmpty) {
-      index =
-          int.tryParse(listEntity.last.path.split('-').last.split('.').first) ??
-              0;
-    }
+    int index = listEntity.isNotEmpty
+        ? int.tryParse(listEntity.last.path.split('-').last.split('.').first) ??
+            0
+        : 0;
 
     String fileName = '${tempDirectory.path}/app$id-${index + 1}.apk';
 
@@ -77,13 +71,12 @@ class DownloadCore {
         fileName,
         cancelToken: token,
         onReceiveProgress: (currentProgress, totalProgress) {
-          if (!_isUpdated) {
-            controller?.setValue(UpdateStatus.Dowloading);
-            _isUpdated = true;
+          if (controller?.status == UpdateStatus.none) {
+            controller?.setValue(UpdateStatus.Downloading);
           }
 
-          final cp = currentProgress + downloadedLength;
-          final tp = totalProgress + downloadedLength;
+          final int cp = currentProgress + downloadedLength;
+          final int tp = totalProgress + downloadedLength;
 
           controller?.setProgress(cp, tp);
 
@@ -99,23 +92,19 @@ class DownloadCore {
                 '${formatBytes(cp, 1)} / ${formatBytes(tp, 1)}';
           }
 
-          ///Current progress + old progress (the bytes already downloaded)
-          if (cp == totalProgress) {
-            //Update Controller
-            controller?.setValue(UpdateStatus.Completed);
-
-            //Dismiss the dialog
-            if (!_isDisposed) dismiss.call();
-
-            ///Open the downloaded apk file
-            // OpenFilex.open('${tempDirectory.path}/app.apk');
-            OpenFilex.open(fileName);
-          }
-
-          if (currentProgress == totalProgress && isResumed) {
-            controller?.setValue(UpdateStatus.Completed);
-            dismiss.call();
-            _mergeFiles(tempDirectory);
+          if (currentProgress == totalProgress) {
+            //if the download was resumed then merge all the files
+            // otherwise open the downloaded file
+            if (isResumed) {
+              _mergeFiles(tempDirectory);
+            } else {
+              OpenFilex.open(fileName);
+            }
+
+            if (!_isDisposed) {
+              dismiss.call();
+              controller?.setValue(UpdateStatus.Completed);
+            }
           }
 
           if (currentProgress > totalProgress) {
@@ -148,7 +137,7 @@ class DownloadCore {
     int length = 0;
 
     for (FileSystemEntity entity in listEntity) {
-      length = length + File(entity.path).lengthSync();
+      length += File(entity.path).lengthSync();
     }
 
     String totalLength = await checkFileSize();
@@ -174,18 +163,15 @@ class DownloadCore {
       await file.delete();
     }
 
-    List<int> list = [];
+    IOSink outputFile = file.openWrite(mode: FileMode.write);
 
     for (FileSystemEntity entity in listEntity) {
-      var byte = await File(entity.path).readAsBytes();
-      list.addAll(byte);
+      List<int> bytes = await File(entity.path).readAsBytes();
+      outputFile.add(bytes);
     }
 
-    await file.writeAsBytes(
-      list,
-    );
+    await outputFile.close();
 
-    // OpenFile.open(file.path);
     OpenFilex.open(file.path);
   }
 

lib/src/enums.dart

@@ -12,7 +12,7 @@ enum UpdateStatus {
   Pending,
 
   ///when an update starts downloading
-  Dowloading,
+  Downloading,
 
   ///when the update is downloaded and ready to install
   Completed,

lib/src/update_dialog.dart

@@ -19,7 +19,7 @@ class UpdateDialog extends StatefulWidget {
     this.cancelText,
     required this.elevation,
     required this.token,
-    this.status = UpdateStatus.Dowloading,
+    this.status = UpdateStatus.Downloading,
     required this.id,
     required this.enableResume,
   });
@@ -168,7 +168,7 @@ class _UpdateDialogState extends State<UpdateDialog> {
                   setState(() {
                     _changeDialog = true;
                   });
-                  status = UpdateStatus.Dowloading;
+                  status = UpdateStatus.Downloading;
 
                   core.startDownload();
                 },
@@ -299,7 +299,7 @@ class _UpdateDialogState extends State<UpdateDialog> {
                     core.cancel();
                     return;
                   }
-                  if (status == UpdateStatus.Dowloading ||
+                  if (status == UpdateStatus.Downloading ||
                       status == UpdateStatus.Resume) {
                     core.pause();
                     _updateStatus(UpdateStatus.Paused);
@@ -316,7 +316,7 @@ class _UpdateDialogState extends State<UpdateDialog> {
                 icon: Icon(
                   !widget.enableResume
                       ? Icons.clear_rounded
-                      : (status == UpdateStatus.Dowloading
+                      : (status == UpdateStatus.Downloading
                           ? Icons.clear_rounded
                           : status == UpdateStatus.Resume
                               ? Icons.pause_rounded

pubspec.lock

@@ -77,10 +77,10 @@ packages:
     dependency: "direct dev"
     description:
       name: build_runner
-      sha256: "5e1929ad37d48bd382b124266cb8e521de5548d406a45a5ae6656c13dab73e37"
+      sha256: "10c6bcdbf9d049a0b666702cf1cee4ddfdc38f02a19d35ae392863b47519848b"
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.5"
+    version: "2.4.6"
   build_runner_core:
     dependency: transitive
     description:
@@ -133,10 +133,10 @@ packages:
     dependency: transitive
     description:
       name: code_builder
-      sha256: "0d43dd1288fd145de1ecc9a3948ad4a6d5a82f0a14c4fdd0892260787d975cbe"
+      sha256: "4ad01d6e56db961d29661561effde45e519939fdaeb46c351275b182eac70189"
       url: "https://pub.dev"
     source: hosted
-    version: "4.4.0"
+    version: "4.5.0"
   collection:
     dependency: transitive
     description:
@@ -173,10 +173,10 @@ packages:
     dependency: "direct main"
     description:
       name: dio
-      sha256: b99b1d56dc0d5dece70957023af002dbd49614b4a1bf86d3a254af3fe781bdf2
+      sha256: a9d76e72985d7087eb7c5e7903224ae52b337131518d127c554b9405936752b8
       url: "https://pub.dev"
     source: hosted
-    version: "5.2.0+1"
+    version: "5.2.1+1"
   fake_async:
     dependency: transitive
     description:
@@ -218,10 +218,10 @@ packages:
     dependency: "direct dev"
     description:
       name: flutter_lints
-      sha256: aeb0b80a8b3709709c9cc496cdc027c5b3216796bc0af0ce1007eaf24464fd4c
+      sha256: "2118df84ef0c3ca93f96123a616ae8540879991b8b57af2f81b76a7ada49b2a4"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.1"
+    version: "2.0.2"
   flutter_test:
     dependency: "direct dev"
     description: flutter
@@ -260,10 +260,10 @@ packages:
     dependency: "direct main"
     description:
       name: http
-      sha256: "4c3f04bfb64d3efd508d06b41b825542f08122d30bda4933fb95c069d22a4fa3"
+      sha256: "759d1a329847dd0f39226c688d3e06a6b8679668e350e2891a6474f8b4bb8525"
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.0"
+    version: "1.1.0"
   http_multi_server:
     dependency: transitive
     description:
@@ -356,10 +356,10 @@ packages:
     dependency: "direct dev"
     description:
       name: mockito
-      sha256: "8b46d7eb40abdda92d62edd01546051f0c27365e65608c284de336dccfef88cc"
+      sha256: "7d5b53bcd556c1bc7ffbe4e4d5a19c3e112b7e925e9e172dd7c6ad0630812616"
       url: "https://pub.dev"
     source: hosted
-    version: "5.4.1"
+    version: "5.4.2"
   open_filex:
     dependency: "direct main"
     description: