X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/dafcdfb76147ce52da2a622bc7ad044001bb797c..622d78906b423ceb39e2640dd7dd0cebabf6bb3c:/src/com/owncloud/android/ui/activity/MoveActivity.java diff --git a/src/com/owncloud/android/ui/activity/MoveActivity.java b/src/com/owncloud/android/ui/activity/MoveActivity.java index 69d4d28a..7dfb447e 100644 --- a/src/com/owncloud/android/ui/activity/MoveActivity.java +++ b/src/com/owncloud/android/ui/activity/MoveActivity.java @@ -65,6 +65,11 @@ import com.owncloud.android.utils.Log_OC; public class MoveActivity extends HookActivity implements FileFragment.ContainerActivity, OnClickListener, SwipeRefreshLayout.OnRefreshListener { + + public static final String EXTRA_CURRENT_FOLDER = UploadFilesActivity.class.getCanonicalName() + ".EXTRA_CURRENT_FOLDER"; + public static final String EXTRA_TARGET_FILE = UploadFilesActivity.class.getCanonicalName() + "EXTRA_TARGET_FILE"; + + public static final int RESULT_OK_AND_MOVE = 1; private SyncBroadcastReceiver mSyncBroadcastReceiver; @@ -364,11 +369,13 @@ public class MoveActivity extends HookActivity implements FileFragment.Container if (v == mCancelBtn) { finish(); } else if (v == mChooseBtn) { - // TODO request to move, OR save selected folder as a result and let request for caller - Toast.makeText( MoveActivity.this, - "TODO: MOVE IMPLEMENTATION", - Toast.LENGTH_LONG) - .show(); + Intent i = getIntent(); + OCFile targetFile = (OCFile) i.getParcelableExtra(MoveActivity.EXTRA_TARGET_FILE); + + Intent data = new Intent(); + data.putExtra(EXTRA_CURRENT_FOLDER, getCurrentFolder()); + data.putExtra(EXTRA_TARGET_FILE, targetFile); + setResult(RESULT_OK_AND_MOVE, data); finish(); } }