projects
/
pub
/
Android
/
ownCloud.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Changes after CR
[pub/Android/ownCloud.git]
/
src
/
com
/
owncloud
/
android
/
ui
/
activity
/
UploadPathActivity.java
diff --git
a/src/com/owncloud/android/ui/activity/UploadPathActivity.java
b/src/com/owncloud/android/ui/activity/UploadPathActivity.java
index
4c52411
..
06f71c6
100644
(file)
--- a/
src/com/owncloud/android/ui/activity/UploadPathActivity.java
+++ b/
src/com/owncloud/android/ui/activity/UploadPathActivity.java
@@
-82,12
+82,8
@@
public class UploadPathActivity extends FolderPickerActivity implements FileFrag
if (v == mCancelBtn) {
finish();
} else if (v == mChooseBtn) {
if (v == mCancelBtn) {
finish();
} else if (v == mChooseBtn) {
- Intent i = getIntent();
- OCFile targetFile = (OCFile) i.getParcelableExtra(UploadPathActivity.EXTRA_TARGET_FILE);
-
Intent data = new Intent();
data.putExtra(EXTRA_CURRENT_FOLDER, getCurrentFolder());
Intent data = new Intent();
data.putExtra(EXTRA_CURRENT_FOLDER, getCurrentFolder());
- data.putExtra(EXTRA_TARGET_FILE, targetFile);
setResult(RESULT_OK_SET_UPLOAD_PATH, data);
finish();
}
setResult(RESULT_OK_SET_UPLOAD_PATH, data);
finish();
}