From: David A. Velasco <dvelasco@solidgear.es>
Date: Mon, 9 Jul 2012 09:28:51 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master' into moresync
X-Git-Tag: oc-android-1.4.3~298
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/cbf9ca8beac99dc06678d13c5f80804d56445472?hp=93de9f91d56ec3ff6ccd1d26df75dc1293e861bb

Merge remote-tracking branch 'origin/master' into moresync
---

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 1d386b9f..1fb20757 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -18,7 +18,7 @@
  -->
 <manifest package="eu.alefzero.owncloud"
     android:versionCode="1"
-    android:versionName="0.1.151B" xmlns:android="http://schemas.android.com/apk/res/android">
+    android:versionName="0.1.152B" 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/activity/FileDisplayActivity.java b/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java
index d5bdc59d..3412af81 100644
--- a/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java
+++ b/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java
@@ -633,11 +633,14 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
             if (account_name.equals(AccountUtils.getCurrentOwnCloudAccount(context).name)) {  
             
                 String synchFolderRemotePath = intent.getStringExtra(FileSyncService.SYNC_FOLDER_REMOTE_PATH); 
-                        
-                if (mCurrentDir == null)
+                 
+                boolean fillBlankRoot = false;
+                if (mCurrentDir == null) {
                     mCurrentDir = mStorageManager.getFileByPath("/");
+                    fillBlankRoot = (mCurrentDir != null);
+                }
 
-                if (synchFolderRemotePath != null && mCurrentDir != null && mCurrentDir.getRemotePath().equals(synchFolderRemotePath) ) {
+                if (synchFolderRemotePath != null && mCurrentDir != null && (mCurrentDir.getRemotePath().equals(synchFolderRemotePath) || fillBlankRoot) ) {
                     FileListFragment fileListFragment = (FileListFragment) getSupportFragmentManager()
                             .findFragmentById(R.id.fileList);
                     mCurrentDir = getStorageManager().getFileByPath(synchFolderRemotePath);