From 7c3ad32deeb51af4b633a14c2932be3cf6af2266 Mon Sep 17 00:00:00 2001 From: tibbi Date: Sat, 12 Nov 2016 19:57:18 +0100 Subject: [PATCH] allow copying and moving only photo and video files with the gallery --- .../simplemobiletools/gallery/activities/MainActivity.java | 2 +- .../simplemobiletools/gallery/activities/MediaActivity.java | 2 +- .../gallery/activities/ViewPagerActivity.java | 2 +- .../com/simplemobiletools/gallery/dialogs/CopyDialog.kt | 6 +++--- 4 files changed, 6 insertions(+), 6 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 38d9ce843..9590a1fcf 100644 --- a/app/src/main/java/com/simplemobiletools/gallery/activities/MainActivity.java +++ b/app/src/main/java/com/simplemobiletools/gallery/activities/MainActivity.java @@ -52,7 +52,7 @@ import butterknife.ButterKnife; public class MainActivity extends SimpleActivity implements AdapterView.OnItemClickListener, GridView.MultiChoiceModeListener, GridView.OnTouchListener, SwipeRefreshLayout.OnRefreshListener, ChangeSorting.ChangeDialogListener, GetDirectoriesAsynctask.GetDirectoriesListener, - CopyMoveTask.CopyListener { + CopyMoveTask.CopyMoveListener { @BindView(R.id.directories_grid) GridView mGridView; @BindView(R.id.directories_holder) SwipeRefreshLayout mSwipeRefreshLayout; 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 1f9225c5e..8f5458493 100644 --- a/app/src/main/java/com/simplemobiletools/gallery/activities/MediaActivity.java +++ b/app/src/main/java/com/simplemobiletools/gallery/activities/MediaActivity.java @@ -51,7 +51,7 @@ import butterknife.ButterKnife; public class MediaActivity extends SimpleActivity implements AdapterView.OnItemClickListener, GridView.MultiChoiceModeListener, GridView.OnTouchListener, - SwipeRefreshLayout.OnRefreshListener, ChangeSorting.ChangeDialogListener, CopyMoveTask.CopyListener { + SwipeRefreshLayout.OnRefreshListener, ChangeSorting.ChangeDialogListener, CopyMoveTask.CopyMoveListener { private static final String TAG = MediaActivity.class.getSimpleName(); @BindView(R.id.media_grid) GridView mGridView; @BindView(R.id.media_holder) SwipeRefreshLayout mSwipeRefreshLayout; 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 2288c163d..2c4820a7b 100644 --- a/app/src/main/java/com/simplemobiletools/gallery/activities/ViewPagerActivity.java +++ b/app/src/main/java/com/simplemobiletools/gallery/activities/ViewPagerActivity.java @@ -43,7 +43,7 @@ import butterknife.OnClick; public class ViewPagerActivity extends SimpleActivity implements ViewPager.OnPageChangeListener, View.OnSystemUiVisibilityChangeListener, ViewPager.OnTouchListener, - ViewPagerFragment.FragmentClickListener, CopyMoveTask.CopyListener { + ViewPagerFragment.FragmentClickListener, CopyMoveTask.CopyMoveListener { @BindView(R.id.undo_delete) View mUndoBtn; @BindView(R.id.view_pager) MyViewPager mPager; 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 83cdd32ea..dac7684ba 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/dialogs/CopyDialog.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/dialogs/CopyDialog.kt @@ -16,7 +16,7 @@ import kotlinx.android.synthetic.main.dialog_copy_move.view.* import java.io.File import java.util.* -class CopyDialog(val activity: SimpleActivity, val files: ArrayList, val copyMoveListener: CopyMoveTask.CopyListener) { +class CopyDialog(val activity: SimpleActivity, val files: ArrayList, val copyMoveListener: CopyMoveTask.CopyMoveListener) { init { val context = activity @@ -76,13 +76,13 @@ class CopyDialog(val activity: SimpleActivity, val files: ArrayList, val c if (view.dialog_radio_group.checkedRadioButtonId == R.id.dialog_radio_copy) { context.toast(R.string.copying) val pair = Pair, File>(files, destinationDir) - CopyMoveTask(context, false, config.treeUri, copyMoveListener).execute(pair) + CopyMoveTask(context, false, config.treeUri, true, copyMoveListener).execute(pair) dismiss() } else { if (context.isPathOnSD(sourcePath) || context.isPathOnSD(destinationPath)) { context.toast(R.string.moving) val pair = Pair, File>(files, destinationDir) - CopyMoveTask(context, true, config.treeUri, copyMoveListener).execute(pair) + CopyMoveTask(context, true, config.treeUri, true, copyMoveListener).execute(pair) dismiss() } else { val updatedFiles = ArrayList(files.size * 2)