From 5a560ebd6247f5579686fcf7b3f6e46e64868d34 Mon Sep 17 00:00:00 2001
From: motionman <dmytro.hutsulenko@ekreative.com>
Date: Wed, 3 Aug 2022 12:22:33 +0300
Subject: [PATCH] feat: udate application file + progress

---
 .idea/deploymentTargetDropDown.xml              | 17 -----------------
 .../ua/motionman/ssfilestack/MainActivity.kt    |  4 ++--
 filestack/src/main/AndroidManifest.xml          |  2 ++
 .../UploadingProgressViewModel.kt               | 10 +++++-----
 4 files changed, 9 insertions(+), 24 deletions(-)
 delete mode 100644 .idea/deploymentTargetDropDown.xml

diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
deleted file mode 100644
index 8173142..0000000
--- a/.idea/deploymentTargetDropDown.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="deploymentTargetDropDown">
-    <runningDeviceTargetSelectedWithDropDown>
-      <Target>
-        <type value="RUNNING_DEVICE_TARGET" />
-        <deviceKey>
-          <Key>
-            <type value="VIRTUAL_DEVICE_PATH" />
-            <value value="$USER_HOME$/.android/avd/Pixel_4_API_31.avd" />
-          </Key>
-        </deviceKey>
-      </Target>
-    </runningDeviceTargetSelectedWithDropDown>
-    <timeTargetWasSelectedWithDropDown value="2022-08-02T07:02:32.184046Z" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/app/src/main/java/ua/motionman/ssfilestack/MainActivity.kt b/app/src/main/java/ua/motionman/ssfilestack/MainActivity.kt
index 7137820..2f9c640 100644
--- a/app/src/main/java/ua/motionman/ssfilestack/MainActivity.kt
+++ b/app/src/main/java/ua/motionman/ssfilestack/MainActivity.kt
@@ -41,11 +41,11 @@ class MainActivity : AppCompatActivity() {
             putExtra(FilestackActivity.API_KEY, "AEHrSDUikTDqTbYuRTesYz")
             putExtra(
                 FilestackActivity.POLICY_KEY,
-                "eyJjYWxsIjogWyJyZWFkIiwgImNvbnZlcnQiLCAicGljayIsICJzdG9yZSJdLCAiZXhwaXJ5IjogMTY1OTQ3MDg5OC4wMDE5MzEsICJtYXhTaXplIjogNTM2ODcwOTEyMH0="
+                "eyJjYWxsIjogWyJyZWFkIiwgImNvbnZlcnQiLCAicGljayIsICJzdG9yZSJdLCAiZXhwaXJ5IjogMTY1OTU5ODE3NS42NTA5NzgsICJtYXhTaXplIjogNTM2ODcwOTEyMH0="
             )
             putExtra(
                 FilestackActivity.SIGNATURE_KEY,
-                "64e949a2a83639977d966a3cf66e5e1a02490afbacc8222f81c9be8e36be9184"
+                "a552aa7e6e29a6d34f9e70151ab3a1b9ad6ad633c7d280c345d7769e5ecd0a00"
             )
             startActivityForResult(this, 662)
         }
diff --git a/filestack/src/main/AndroidManifest.xml b/filestack/src/main/AndroidManifest.xml
index 89724b7..fc380ab 100644
--- a/filestack/src/main/AndroidManifest.xml
+++ b/filestack/src/main/AndroidManifest.xml
@@ -12,6 +12,8 @@
 
     <application
         android:allowBackup="true"
+        android:hardwareAccelerated="false"
+        android:largeHeap="true"
         android:supportsRtl="true">
         <activity
             android:name=".ui.FilestackActivity"
diff --git a/filestack/src/main/java/ua/motionman/filestack/ui/uploadingprogress/UploadingProgressViewModel.kt b/filestack/src/main/java/ua/motionman/filestack/ui/uploadingprogress/UploadingProgressViewModel.kt
index 7ad581b..08e5651 100644
--- a/filestack/src/main/java/ua/motionman/filestack/ui/uploadingprogress/UploadingProgressViewModel.kt
+++ b/filestack/src/main/java/ua/motionman/filestack/ui/uploadingprogress/UploadingProgressViewModel.kt
@@ -93,11 +93,11 @@ class UploadingProgressViewModel(
     }
 
     private fun updateProgress(currentProgress: Progress<FileLink>) {
-        updateViewState(
-            _viewState.value.copy(
-                progress = calculateProgress(currentFile, currentProgress.percent),
-            )
-        )
+        val currentPercent = calculateProgress(currentFile, currentProgress.percent)
+        val progress =
+            if (currentPercent < _viewState.value.progress) _viewState.value.progress else currentPercent
+
+        updateViewState(_viewState.value.copy(progress = progress))
     }
 
     private fun calculateProgress(file: Int, percent: Double): Int {