Эх сурвалжийг харах

Fixed null pointer in synchronization

David A. Velasco 13 жил өмнө
parent
commit
935a7b0934

+ 1 - 1
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" />

+ 2 - 1
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);  
                     }