mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-26 23:28:42 +03:00
Code Issues Projects Releases Packages Wiki Activity

Uploading files are protected against removal from other apps

Browse source
This commit is contained in:
David A. Velasco 2012-08-24 14:50:37 +02:00
parent 91bc3fdb1e
commit be22e58b39
3 changed files with 23 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
AndroidManifest.xml
View file

@ -17,8 +17,8 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<manifest package="com.owncloud.android"
android:versionCode="103007"
android:versionName="1.3.7" xmlns:android="http://schemas.android.com/apk/res/android">
android:versionCode="103008"
android:versionName="1.3.8" xmlns:android="http://schemas.android.com/apk/res/android">
<uses-permission android:name="android.permission.GET_ACCOUNTS" />
<uses-permission android:name="android.permission.USE_CREDENTIALS" />

3
src/com/owncloud/android/files/services/FileUploader.java
View file

@ -220,6 +220,7 @@ public class FileUploader extends Service implements OnDatatransferProgressListe
availablePath = getAvailableRemotePath(wc, mRemotePaths[i]);
try {
File f = new File(mRemotePaths[i]);
long size = localFiles[i].length();
parentDirId = storageManager.getFileByPath(f.getParent().endsWith("/")?f.getParent():f.getParent()+"/").getFileId();
if(availablePath != null) {
mRemotePaths[i] = availablePath;
@ -227,7 +228,7 @@ public class FileUploader extends Service implements OnDatatransferProgressListe
if (wc.putFile(mLocalPaths[i], mRemotePaths[i], mimeType)) {
OCFile new_file = new OCFile(mRemotePaths[i]);
new_file.setMimetype(mimeType);
new_file.setFileLength(localFiles[i].length());
new_file.setFileLength(size);
new_file.setModificationTimestamp(System.currentTimeMillis());
new_file.setLastSyncDate(0);
new_file.setStoragePath(mLocalPaths[i]);

24
src/eu/alefzero/webdav/FileRequestEntity.java
View file

@ -5,6 +5,11 @@ import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.io.RandomAccessFile;
import java.nio.ByteBuffer;
import java.nio.channels.FileChannel;
import java.nio.channels.FileLock;
import java.nio.channels.OverlappingFileLockException;
import org.apache.commons.httpclient.methods.RequestEntity;
@ -49,12 +54,19 @@ public class FileRequestEntity implements RequestEntity {
}
public void writeRequest(final OutputStream out) throws IOException {
byte[] tmp = new byte[4096];
//byte[] tmp = new byte[4096];
ByteBuffer tmp = ByteBuffer.allocate(4096);
int i = 0;
InputStream instream = new FileInputStream(this.file);
FileChannel channel = new RandomAccessFile(this.file, "rw").getChannel();
FileLock lock = channel.tryLock();
//InputStream instream = new FileInputStream(this.file);
try {
while ((i = instream.read(tmp)) >= 0) {
out.write(tmp, 0, i);
//while ((i = instream.read(tmp)) >= 0) {
while ((i = channel.read(tmp)) >= 0) {
out.write(tmp.array(), 0, i);
tmp.clear();
if (listener != null)
listener.transferProgress(i);
}
@ -63,7 +75,9 @@ public class FileRequestEntity implements RequestEntity {
throw new RuntimeException("Ugly solution to workaround the default policy of retries when the server falls while uploading ; temporal fix; really", io);
} finally {
instream.close();
//instream.close();
lock.release();
channel.close();
}
}