projects
/
pub
/
Android
/
ownCloud.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #1088 from owncloud/updated_docs_about_target_of_PRs
[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
d1509f9
..
db704d1
100644
(file)
--- a/
src/com/owncloud/android/ui/activity/UploadPathActivity.java
+++ b/
src/com/owncloud/android/ui/activity/UploadPathActivity.java
@@
-20,7
+20,6
@@
package com.owncloud.android.ui.activity;
import android.accounts.Account;
package com.owncloud.android.ui.activity;
import android.accounts.Account;
-
import android.os.Bundle;
import android.view.View.OnClickListener;
import android.os.Bundle;
import android.view.View.OnClickListener;
@@
-68,7
+67,8
@@
public class UploadPathActivity extends FolderPickerActivity implements FileFrag
if (!stateWasRecovered) {
OCFileListFragment listOfFolders = getListOfFilesFragment();
if (!stateWasRecovered) {
OCFileListFragment listOfFolders = getListOfFilesFragment();
- listOfFolders.listDirectory(folder);
+ // TODO Enable when "On Device" is recovered ?
+ listOfFolders.listDirectory(folder/*, false*/);
startSyncFolderOperation(folder, false);
}
startSyncFolderOperation(folder, false);
}