feat: udate application file + progress

ekreative · Aug 3, 2022 · 5a560eb · 5a560eb
1 parent cfe9a91
commit 5a560eb
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 24 deletions.
diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
diff --git 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
@@ -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/...k/src/main/java/ua/motionman/filestack/ui/uploadingprogress/UploadingProgressViewModel.kt b/...k/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 {