From 035fde0a8f0601039bf5ca14c4636ca3663c0e02 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Tue, 6 Dec 2016 10:03:43 +0100
Subject: [PATCH] some improvements to Copy

---
 .../filemanager/dialogs/CopyDialog.kt                 | 11 +++++++----
 .../filemanager/fragments/ItemsFragment.kt            |  2 ++
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/app/src/main/kotlin/com/simplemobiletools/filemanager/dialogs/CopyDialog.kt b/app/src/main/kotlin/com/simplemobiletools/filemanager/dialogs/CopyDialog.kt
index 2011aef7..80b66d47 100644
--- a/app/src/main/kotlin/com/simplemobiletools/filemanager/dialogs/CopyDialog.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/filemanager/dialogs/CopyDialog.kt
@@ -97,10 +97,13 @@ class CopyDialog(val activity: SimpleActivity, val files: ArrayList<File>, val c
                                 updatedFiles.add(destination)
                         }
 
-                        context.scanFiles(updatedFiles) {}
-                        context.toast(R.string.moving_success)
-                        dismiss()
-                        copyMoveListener.copySucceeded(true, files.size * 2 == updatedFiles.size)
+                        context.scanFiles(updatedFiles) {
+                            activity.runOnUiThread {
+                                context.toast(R.string.moving_success)
+                                dismiss()
+                                copyMoveListener.copySucceeded(true, files.size * 2 == updatedFiles.size)
+                            }
+                        }
                     }
                 }
             })
diff --git a/app/src/main/kotlin/com/simplemobiletools/filemanager/fragments/ItemsFragment.kt b/app/src/main/kotlin/com/simplemobiletools/filemanager/fragments/ItemsFragment.kt
index a4d421fb..ee547964 100644
--- a/app/src/main/kotlin/com/simplemobiletools/filemanager/fragments/ItemsFragment.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/filemanager/fragments/ItemsFragment.kt
@@ -88,7 +88,9 @@ class ItemsFragment : android.support.v4.app.Fragment(), ItemsAdapter.ItemOperat
                 setOnTouchListener { view, motionEvent -> checkDelete(); false }
             }
         } else {
+            val state = (items_list.layoutManager as LinearLayoutManager).onSaveInstanceState()
             (currAdapter as ItemsAdapter).updateItems(mItems)
+            (items_list.layoutManager as LinearLayoutManager).onRestoreInstanceState(state)
         }
 
         getRecyclerLayoutManager().onRestoreInstanceState(arguments.getParcelable<Parcelable>(SCROLL_STATE))