From: David A. Velasco <dvelasco@solidgear.es>
Date: Wed, 18 Jul 2012 12:38:02 +0000 (+0200)
Subject: Fixed null pointer in synchronization
X-Git-Tag: oc-android-1.4.3~264
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/935a7b093454f12826d51b9357bec52d145cda3c?ds=inline

Fixed null pointer in synchronization
---

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 20ba3781..7f30c522 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -18,7 +18,7 @@
  -->
 <manifest package="eu.alefzero.owncloud"
     android:versionCode="1"
-    android:versionName="0.1.165B" xmlns:android="http://schemas.android.com/apk/res/android">
+    android:versionName="0.1.166B" 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 f9de1ac2..7493c701 100644
--- a/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java
+++ b/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java
@@ -646,9 +646,10 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
 
                 if ((synchFolderRemotePath != null && mCurrentDir != null && (mCurrentDir.getRemotePath().equals(synchFolderRemotePath)))
                         || fillBlankRoot ) {
+                    if (!fillBlankRoot) 
+                        mCurrentDir = getStorageManager().getFileByPath(synchFolderRemotePath);
                     FileListFragment fileListFragment = (FileListFragment) getSupportFragmentManager()
                             .findFragmentById(R.id.fileList);
-                    mCurrentDir = getStorageManager().getFileByPath(synchFolderRemotePath);
                     if (fileListFragment != null) {
                         fileListFragment.listDirectory(mCurrentDir);  
                     }