mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-27 17:46:37 +03:00
Code Issues Projects Releases Packages Wiki Activity

Minor changes from code review

Browse source
This commit is contained in:
Juan Carlos González Cabrero 2016-04-13 09:26:16 +02:00
parent 9c617e993b
commit 1d30c83809
3 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/com/owncloud/android/ui/activity/FileActivity.java
View file

@ -1057,8 +1057,7 @@ public class FileActivity extends AppCompatActivity
if (file.isFolder()) {
return file;
} else if (getStorageManager() != null) {
String parentPath = file.getRemotePath().substring(0,
file.getRemotePath().lastIndexOf(file.getFileName()));
String parentPath = file.getParentRemotePath();
return getStorageManager().getFileByPath(parentPath);
}
}

3
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
View file

@ -1032,7 +1032,8 @@ public class FileDisplayActivity extends HookActivity
requestCredentialsUpdate(context);
} else if(RemoteOperationResult.ResultCode.SSL_RECOVERABLE_PEER_UNVERIFIED.equals(synchResult.getCode())) {
} else if(RemoteOperationResult.ResultCode.SSL_RECOVERABLE_PEER_UNVERIFIED.equals(
synchResult.getCode())) {
showUntrustedCertDialog(synchResult);
}

12
src/com/owncloud/android/ui/activity/Uploader.java
View file

@ -350,7 +350,7 @@ public class Uploader extends FileActivity
} else {
mParents.pop();
String full_path = generatePath(mParents);
startSyncFolderOperation(getStorageManager().getFileByPath(full_path), false);
startSyncFolderOperation(getStorageManager().getFileByPath(full_path));
populateDirectoryList();
}
}
@ -371,7 +371,7 @@ public class Uploader extends FileActivity
}
if (files.get(position).isFolder()){
OCFile folderToEnter = files.get(position);
startSyncFolderOperation(folderToEnter, false);
startSyncFolderOperation(folderToEnter);
mParents.push(folderToEnter.getFileName());
populateDirectoryList();
}
@ -475,10 +475,10 @@ public class Uploader extends FileActivity
@Override
public void onSavedCertificate() {
startSyncFolderOperation(getCurrentDir(), false);
startSyncFolderOperation(getCurrentDir());
}
private void startSyncFolderOperation(OCFile folder, boolean ignoreETag) {
private void startSyncFolderOperation(OCFile folder) {
long currentSyncTime = System.currentTimeMillis();
mSyncInProgress = true;
@ -488,7 +488,7 @@ public class Uploader extends FileActivity
currentSyncTime,
false,
false,
ignoreETag,
false,
getStorageManager(),
getAccount(),
getApplicationContext()
@ -736,7 +736,7 @@ public class Uploader extends FileActivity
private void browseToRoot() {
OCFile root = getStorageManager().getFileByPath(OCFile.ROOT_PATH);
mFile = root;
startSyncFolderOperation(root, false);
startSyncFolderOperation(root);
}
private class SyncBroadcastReceiver extends BroadcastReceiver {