From: David A. Velasco <dvelasco@solidgear.es>
Date: Mon, 23 Jul 2012 09:07:59 +0000 (+0200)
Subject: Fix the local file name saved in database when a file is renamed
X-Git-Tag: oc-android-1.4.3~251
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/3e2d5f40b4cf14e7de2688eadb7ec0a6b8473329

Fix the local file name saved in database when a file is renamed
---

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 7c958290..a3d120dc 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -18,7 +18,7 @@
  -->
 <manifest package="eu.alefzero.owncloud"
     android:versionCode="1"
-    android:versionName="0.1.172B" xmlns:android="http://schemas.android.com/apk/res/android">
+    android:versionName="0.1.173B" 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" />
diff --git a/src/eu/alefzero/owncloud/ui/fragment/FileDetailFragment.java b/src/eu/alefzero/owncloud/ui/fragment/FileDetailFragment.java
index 6a34c6d0..156e66ef 100644
--- a/src/eu/alefzero/owncloud/ui/fragment/FileDetailFragment.java
+++ b/src/eu/alefzero/owncloud/ui/fragment/FileDetailFragment.java
@@ -688,7 +688,7 @@ public class FileDetailFragment extends SherlockFragment implements
                 if (!newFilename.equals(mFile.getFileName())) {
                     FileDataStorageManager fdsm = new FileDataStorageManager(mAccount, getActivity().getContentResolver());
                     if (fdsm.getFileById(mFile.getFileId()) != null) {
-                        OCFile newFile = new OCFile(fdsm.getFileById(mFile.getParentId()).getRemotePath() + OCFile.PATH_SEPARATOR + newFilename);
+                        OCFile newFile = new OCFile(fdsm.getFileById(mFile.getParentId()).getRemotePath() + newFilename);
                         newFile.setCreationTimestamp(mFile.getCreationTimestamp());
                         newFile.setFileId(mFile.getFileId());
                         newFile.setFileLength(mFile.getFileLength());
@@ -700,9 +700,9 @@ public class FileDetailFragment extends SherlockFragment implements
                         if (mFile.isDown()) {
                             File f = new File(mFile.getStoragePath());
                             Log.e(TAG, f.getAbsolutePath());
-                            f.renameTo(new File(f.getParent()+"/"+newFilename));
-                            Log.e(TAG, f.getAbsolutePath());
-                            newFile.setStoragePath(f.getAbsolutePath());
+                            f.renameTo(new File(f.getParent() + File.separator + newFilename)); // TODO check if fails
+                            Log.e(TAG, f.getParent() + File.separator + newFilename);
+                            newFile.setStoragePath(f.getParent() + File.separator + newFilename);
                         }
                         
                         new Thread(new RenameRunnable(mFile, newFile, mAccount, new Handler())).start();