From afb722ab2486a51f1c0e93181b4fd2d01109dca6 Mon Sep 17 00:00:00 2001 From: tibbi Date: Sat, 12 Nov 2016 21:33:46 +0100 Subject: [PATCH] let the user know if not all files have been copied/moved --- .../gallery/activities/MainActivity.java | 11 ++++++++--- .../gallery/activities/MediaActivity.java | 11 ++++++++--- .../gallery/activities/ViewPagerActivity.java | 11 ++++++++--- .../simplemobiletools/gallery/dialogs/CopyDialog.kt | 6 +++--- app/src/main/res/values-de/strings.xml | 2 ++ app/src/main/res/values-es/strings.xml | 2 ++ app/src/main/res/values-it/strings.xml | 2 ++ app/src/main/res/values-ja/strings.xml | 2 ++ app/src/main/res/values-pt-rPT/strings.xml | 2 ++ app/src/main/res/values-sv/strings.xml | 2 ++ app/src/main/res/values/strings.xml | 2 ++ 11 files changed, 41 insertions(+), 12 deletions(-) diff --git a/app/src/main/java/com/simplemobiletools/gallery/activities/MainActivity.java b/app/src/main/java/com/simplemobiletools/gallery/activities/MainActivity.java index de44d693f..4218b81ce 100644 --- a/app/src/main/java/com/simplemobiletools/gallery/activities/MainActivity.java +++ b/app/src/main/java/com/simplemobiletools/gallery/activities/MainActivity.java @@ -332,10 +332,15 @@ public class MainActivity extends SimpleActivity new CopyDialog(this, files, new CopyMoveTask.CopyMoveListener() { @Override - public void copySucceeded(boolean deleted) { - if (deleted) + public void copySucceeded(boolean deleted, boolean copiedAll) { + int msgId; + if (deleted) { getDirectories(); - Utils.Companion.showToast(getApplicationContext(), deleted ? R.string.moving_success : R.string.copying_success); + msgId = copiedAll ? R.string.moving_success : R.string.moving_success_partial; + } else { + msgId = copiedAll? R.string.copying_success : R.string.copying_success_partial; + } + Utils.Companion.showToast(getApplicationContext(), msgId); } @Override diff --git a/app/src/main/java/com/simplemobiletools/gallery/activities/MediaActivity.java b/app/src/main/java/com/simplemobiletools/gallery/activities/MediaActivity.java index 245025e7f..78c4f7f45 100644 --- a/app/src/main/java/com/simplemobiletools/gallery/activities/MediaActivity.java +++ b/app/src/main/java/com/simplemobiletools/gallery/activities/MediaActivity.java @@ -419,10 +419,15 @@ public class MediaActivity extends SimpleActivity new CopyDialog(this, files, new CopyMoveTask.CopyMoveListener() { @Override - public void copySucceeded(boolean deleted) { - if (deleted) + public void copySucceeded(boolean deleted, boolean copiedAll) { + int msgId; + if (deleted) { refreshDir(); - Utils.Companion.showToast(getApplicationContext(), deleted ? R.string.moving_success : R.string.copying_success); + msgId = copiedAll ? R.string.moving_success : R.string.moving_success_partial; + } else { + msgId = copiedAll? R.string.copying_success : R.string.copying_success_partial; + } + Utils.Companion.showToast(getApplicationContext(), msgId); } @Override diff --git a/app/src/main/java/com/simplemobiletools/gallery/activities/ViewPagerActivity.java b/app/src/main/java/com/simplemobiletools/gallery/activities/ViewPagerActivity.java index d4953719d..256299336 100644 --- a/app/src/main/java/com/simplemobiletools/gallery/activities/ViewPagerActivity.java +++ b/app/src/main/java/com/simplemobiletools/gallery/activities/ViewPagerActivity.java @@ -192,10 +192,15 @@ public class ViewPagerActivity extends SimpleActivity files.add(file); new CopyDialog(this, files, new CopyMoveTask.CopyMoveListener() { @Override - public void copySucceeded(boolean deleted) { - if (deleted) + public void copySucceeded(boolean deleted, boolean copiedAll) { + int msgId; + if (deleted) { reloadViewPager(); - Utils.Companion.showToast(getApplicationContext(), deleted ? R.string.moving_success : R.string.copying_success); + msgId = copiedAll ? R.string.moving_success : R.string.moving_success_partial; + } else { + msgId = copiedAll? R.string.copying_success : R.string.copying_success_partial; + } + Utils.Companion.showToast(getApplicationContext(), msgId); } @Override diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/dialogs/CopyDialog.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/dialogs/CopyDialog.kt index 297f806a8..a3626a63d 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/dialogs/CopyDialog.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/dialogs/CopyDialog.kt @@ -89,13 +89,13 @@ class CopyDialog(val activity: SimpleActivity, val files: ArrayList, val c updatedFiles.addAll(files) for (file in files) { val destination = File(destinationDir, file.name) - file.renameTo(destination) - updatedFiles.add(destination) + if (file.renameTo(destination)) + updatedFiles.add(destination) } context.scanFiles(updatedFiles) {} dismiss() - copyMoveListener.copySucceeded(true) + copyMoveListener.copySucceeded(true, files.size * 2 == updatedFiles.size) } } }) diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 8b3087e19..c89dc0765 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -56,6 +56,8 @@ Moving… Files moved successfully A file with that name already exists + Some files could not be moved + Some files could not be copied 1 Ordner gelöscht diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 40fe10373..c6a18a904 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -56,6 +56,8 @@ Moving… Files moved successfully A file with that name already exists + Some files could not be moved + Some files could not be copied 1 carpeta eliminada diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 6ac5d820a..93144a46f 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -56,6 +56,8 @@ Moving… Files moved successfully A file with that name already exists + Some files could not be moved + Some files could not be copied 1 cartella eliminata diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index ee195d7a9..5ceabb9cf 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -56,6 +56,8 @@ Moving… Files moved successfully A file with that name already exists + Some files could not be moved + Some files could not be copied 1 フォルダーを削除しました diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index 9dd59bce6..8b140ae6b 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -56,6 +56,8 @@ Moving… Files moved successfully Já existe um ficheiro com este nome + Some files could not be moved + Some files could not be copied 1 pasta apagada diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index df65cf443..80ae6deb6 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -56,6 +56,8 @@ Moving… Files moved successfully A file with that name already exists + Some files could not be moved + Some files could not be copied 1 mapp borttagen diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 4a50b94aa..d7493a98f 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -56,6 +56,8 @@ Moving… Files moved successfully A file with that name already exists + Some files could not be moved + Some files could not be copied 1 folder deleted