Fixed null pointer in synchronization

[pub/Android/ownCloud.git] / src / eu / alefzero / owncloud / ui / activity / FileDisplayActivity.java

diff --git a/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java b/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java
index 81a8da1..7493c70 100644 (file)
--- a/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java
+++ b/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java
@@ -644,10 +644,12 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
                     fillBlankRoot = (mCurrentDir != null);\r
                 }\r
 \r
                     fillBlankRoot = (mCurrentDir != null);\r
                 }\r
 \r

-                if (synchFolderRemotePath != null && mCurrentDir != null && (mCurrentDir.getRemotePath().equals(synchFolderRemotePath) || fillBlankRoot) ) {\r
+                if ((synchFolderRemotePath != null && mCurrentDir != null && (mCurrentDir.getRemotePath().equals(synchFolderRemotePath)))\r
+                        || fillBlankRoot ) {\r
+                    if (!fillBlankRoot) \r
+                        mCurrentDir = getStorageManager().getFileByPath(synchFolderRemotePath);\r

                     FileListFragment fileListFragment = (FileListFragment) getSupportFragmentManager()\r
                             .findFragmentById(R.id.fileList);\r
                     FileListFragment fileListFragment = (FileListFragment) getSupportFragmentManager()\r
                             .findFragmentById(R.id.fileList);\r

-                    mCurrentDir = getStorageManager().getFileByPath(synchFolderRemotePath);\r

                     if (fileListFragment != null) {\r
                         fileListFragment.listDirectory(mCurrentDir);  \r
                     }\r
                     if (fileListFragment != null) {\r
                         fileListFragment.listDirectory(mCurrentDir);  \r
                     }\r