|
@@ -257,7 +257,19 @@ public class ReceiveExternalFilesActivity extends FileActivity
|
|
}
|
|
}
|
|
|
|
|
|
initTargetFolder();
|
|
initTargetFolder();
|
|
- populateDirectoryList();
|
|
|
|
|
|
+ browseToFolderIfItExists();
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ private void browseToFolderIfItExists() {
|
|
|
|
+ String full_path = generatePath(mParents);
|
|
|
|
+ final OCFile fileByPath = getStorageManager().getFileByPath(full_path);
|
|
|
|
+ if (fileByPath != null) {
|
|
|
|
+ startSyncFolderOperation(fileByPath);
|
|
|
|
+ populateDirectoryList();
|
|
|
|
+ } else {
|
|
|
|
+ browseToRoot();
|
|
|
|
+ preferences.setLastUploadPath(OCFile.ROOT_PATH);
|
|
|
|
+ }
|
|
}
|
|
}
|
|
|
|
|
|
@Override
|
|
@Override
|
|
@@ -622,9 +634,7 @@ public class ReceiveExternalFilesActivity extends FileActivity
|
|
super.onBackPressed();
|
|
super.onBackPressed();
|
|
} else {
|
|
} else {
|
|
mParents.pop();
|
|
mParents.pop();
|
|
- String full_path = generatePath(mParents);
|
|
|
|
- startSyncFolderOperation(getStorageManager().getFileByPath(full_path));
|
|
|
|
- populateDirectoryList();
|
|
|
|
|
|
+ browseToFolderIfItExists();
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
@@ -826,6 +836,10 @@ public class ReceiveExternalFilesActivity extends FileActivity
|
|
}
|
|
}
|
|
|
|
|
|
private void startSyncFolderOperation(OCFile folder) {
|
|
private void startSyncFolderOperation(OCFile folder) {
|
|
|
|
+ if (folder == null) {
|
|
|
|
+ throw new IllegalArgumentException("Folder must not be null");
|
|
|
|
+ }
|
|
|
|
+
|
|
long currentSyncTime = System.currentTimeMillis();
|
|
long currentSyncTime = System.currentTimeMillis();
|
|
|
|
|
|
mSyncInProgress = true;
|
|
mSyncInProgress = true;
|
|
@@ -1078,6 +1092,8 @@ public class ReceiveExternalFilesActivity extends FileActivity
|
|
private void browseToRoot() {
|
|
private void browseToRoot() {
|
|
OCFile root = getStorageManager().getFileByPath(OCFile.ROOT_PATH);
|
|
OCFile root = getStorageManager().getFileByPath(OCFile.ROOT_PATH);
|
|
mFile = root;
|
|
mFile = root;
|
|
|
|
+ mParents.clear();
|
|
|
|
+ mParents.add("");
|
|
startSyncFolderOperation(root);
|
|
startSyncFolderOperation(root);
|
|
}
|
|
}
|
|
|
|
|