From 7dfc47ced49068e0035a732c7be8c92e647cd832 Mon Sep 17 00:00:00 2001 From: "David A. Velasco" Date: Fri, 22 Jun 2012 15:14:13 +0200 Subject: [PATCH] Fixed local database incoherence when files whit special characters in their name are uploadad --- AndroidManifest.xml | 2 +- src/eu/alefzero/owncloud/files/services/FileUploader.java | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 52f8e67b..c8e9692b 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -18,7 +18,7 @@ --> + android:versionName="0.1.129B" xmlns:android="http://schemas.android.com/apk/res/android"> diff --git a/src/eu/alefzero/owncloud/files/services/FileUploader.java b/src/eu/alefzero/owncloud/files/services/FileUploader.java index a55675d9..c34e79ce 100644 --- a/src/eu/alefzero/owncloud/files/services/FileUploader.java +++ b/src/eu/alefzero/owncloud/files/services/FileUploader.java @@ -176,12 +176,13 @@ public class FileUploader extends Service implements OnDatatransferProgressListe mCurrentIndexUpload = i; if (wc.putFile(mLocalPaths[i], mRemotePaths[i], mimeType)) { mResult |= true; - OCFile new_file = new OCFile(mRemotePaths[i]); + String decRemotePath = URLDecoder.decode(mRemotePaths[i]); + OCFile new_file = new OCFile(decRemotePath); // FyleSyncAdapter and this MUST use the same encoding when creating a new OCFile new_file.setMimetype(mimeType); new_file.setFileLength(new File(mLocalPaths[i]).length()); new_file.setModificationTimestamp(System.currentTimeMillis()); new_file.setLastSyncDate(0); - new_file.setStoragePath(mLocalPaths[i]); + new_file.setStoragePath(mLocalPaths[i]); File f = new File(URLDecoder.decode(mRemotePaths[i])); new_file.setParentId(storageManager.getFileByPath(f.getParent().endsWith("/")?f.getParent():f.getParent()+"/").getFileId()); storageManager.saveFile(new_file); -- 2.11.0