From: masensio <masensio@solidgear.es>
Date: Wed, 5 Aug 2015 14:48:12 +0000 (+0200)
Subject: Merge commit 'refs/pr/707' into text_file_preview_pr_707_with
X-Git-Tag: oc-android-1.8~17^2~8
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/b694fee63d7bdb8b93e9d46d28303eff094923fe?hp=-c

Merge commit 'refs/pr/707' into text_file_preview_pr_707_with

Conflicts:
	src/com/owncloud/android/datamodel/OCFile.java
	src/com/owncloud/android/ui/activity/FileDisplayActivity.java
	src/com/owncloud/android/ui/fragment/OCFileListFragment.java
---

b694fee63d7bdb8b93e9d46d28303eff094923fe
diff --combined build.gradle
index a5c0431f,51544bee..73c094d9
--- a/build.gradle
+++ b/build.gradle
@@@ -3,7 -3,7 +3,7 @@@ buildscript 
          mavenCentral()
      }
      dependencies {
 -        classpath 'com.android.tools.build:gradle:0.14.0'
 +        classpath 'com.android.tools.build:gradle:1.2.3'
      }
  }
  
@@@ -18,17 -18,19 +18,17 @@@ repositories 
      }
  }
  
 -artifacts.add("default", file('libs/actionbarsherlock.aar'))
 -
  dependencies {
      compile name: 'touch-image-view'
      compile 'com.android.support:support-v4:19.1.0'
 -    compile project('libs/actionbarsherlock_lib')
      compile project(':owncloud-android-library')
      compile 'com.jakewharton:disklrucache:2.0.2'
 +    compile 'com.android.support:appcompat-v7:19.1.0'
  }
  
  android {
      compileSdkVersion 19
 -    buildToolsVersion "20.0.0"
 +    buildToolsVersion "22.0.1"
      sourceSets {
          main {
              manifest.srcFile 'AndroidManifest.xml'
@@@ -61,8 -63,8 +61,8 @@@
  
  
      compileOptions {
-         sourceCompatibility JavaVersion.VERSION_1_7
-         targetCompatibility JavaVersion.VERSION_1_7
+         sourceCompatibility JavaVersion.VERSION_1_5
+         targetCompatibility JavaVersion.VERSION_1_5
      }
      
      productFlavors {
diff --combined res/layout/file_preview.xml
index d371e10e,0da53634..3b20d646
--- a/res/layout/file_preview.xml
+++ b/res/layout/file_preview.xml
@@@ -1,8 -1,7 +1,7 @@@
- <?xml version="1.0" encoding="utf-8"?>
- <!--
+ <?xml version="1.0" encoding="utf-8"?><!--
    ownCloud Android client application
  
 -  Copyright (C) 2012-2013  ownCloud Inc.
 +  Copyright (C) 2015 ownCloud Inc.
    
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License version 2,
@@@ -25,40 -24,37 +24,37 @@@
      android:layout_height="match_parent"
      android:background="@color/background_color"
      android:gravity="center"
-     tools:context=".ui.fragment.FilePreviewFragment" >
+     tools:context=".ui.fragment.FilePreviewFragment">
  
-     <FrameLayout 
+     <FrameLayout
          android:id="@+id/visual_area"
-    	    android:layout_width="match_parent"
-    	    android:layout_height="0dp"
-    	    android:layout_alignParentTop="true"
-    	    android:layout_above="@+id/media_controller"
-         >
-     
- 	    <ImageView
- 	        android:id="@+id/image_preview"
- 	        android:layout_width="match_parent"
- 	        android:layout_height="match_parent"
- 	        android:layout_margin="16dp"
- 	        android:layout_gravity="center"
- 	        android:contentDescription="@string/preview_image_description"
- 	        android:src="@drawable/logo" />
- 	    
- 	   	<VideoView  
- 	   	    android:id="@+id/video_preview"
- 			android:layout_width="match_parent"
- 			android:layout_height="match_parent"  
- 			android:layout_gravity="center" 
- 			android:visibility="gone"
- 			/>
- 	   	
-    	</FrameLayout>
-    	
-    	<com.owncloud.android.media.MediaControlView 
-    	    android:id="@id/media_controller"
-    	    android:layout_width="match_parent"
-    	    android:layout_height="wrap_content"
-    	    android:layout_alignParentBottom="true"
-    	    />
+         android:layout_width="match_parent"
+         android:layout_height="0dp"
+         android:layout_alignParentTop="true"
+         android:layout_above="@+id/media_controller">
+ 
+         <ImageView
+             android:id="@+id/image_preview"
+             android:layout_width="match_parent"
+             android:layout_height="match_parent"
+             android:layout_margin="16dp"
+             android:layout_gravity="center"
+             android:contentDescription="@string/preview_image_description"
+             android:src="@drawable/logo" />
+ 
+         <VideoView
+             android:id="@+id/video_preview"
+             android:layout_width="match_parent"
+             android:layout_height="match_parent"
+             android:layout_gravity="center"
+             android:visibility="gone" />
+ 
+     </FrameLayout>
+ 
+     <com.owncloud.android.media.MediaControlView
+         android:id="@id/media_controller"
+         android:layout_width="match_parent"
+         android:layout_height="wrap_content"
+         android:layout_alignParentBottom="true" />
  
  </RelativeLayout>
diff --combined src/com/owncloud/android/datamodel/OCFile.java
index d1821b44,70df2b20..f9882fa4
--- a/src/com/owncloud/android/datamodel/OCFile.java
+++ b/src/com/owncloud/android/datamodel/OCFile.java
@@@ -1,8 -1,6 +1,8 @@@
 -/* ownCloud Android client application
 +/**
 + *   ownCloud Android client application
 + *
   *   Copyright (C) 2012  Bartek Przybylski
 - *   Copyright (C) 2012-2013 ownCloud Inc.
 + *   Copyright (C) 2015 ownCloud Inc.
   *
   *   This program is free software: you can redistribute it and/or modify
   *   it under the terms of the GNU General Public License version 2,
@@@ -22,9 -20,9 +22,9 @@@ package com.owncloud.android.datamodel
  
  import android.os.Parcel;
  import android.os.Parcelable;
+ import android.webkit.MimeTypeMap;
  
  import com.owncloud.android.lib.common.utils.Log_OC;
- import com.owncloud.android.utils.FileStorageUtils;
  
  import java.io.File;
  
@@@ -60,7 -58,7 +60,7 @@@ public class OCFile implements Parcelab
      private boolean mNeedsUpdating;
      private long mLastSyncDateForProperties;
      private long mLastSyncDateForData;
 -    private boolean mKeepInSync;
 +    private boolean mFavorite;
  
      private String mEtag;
  
@@@ -72,8 -70,6 +72,8 @@@
  
      private boolean mNeedsUpdateThumbnail;
  
 +    private boolean mIsDownloading;
 +
  
      /**
       * Create new {@link OCFile} with given path.
@@@ -107,7 -103,7 +107,7 @@@
          mLocalPath = source.readString();
          mMimeType = source.readString();
          mNeedsUpdating = source.readInt() == 0;
 -        mKeepInSync = source.readInt() == 1;
 +        mFavorite = source.readInt() == 1;
          mLastSyncDateForProperties = source.readLong();
          mLastSyncDateForData = source.readLong();
          mEtag = source.readString();
@@@ -116,7 -112,6 +116,7 @@@
          mPermissions = source.readString();
          mRemoteId = source.readString();
          mNeedsUpdateThumbnail = source.readInt() == 0;
 +        mIsDownloading = source.readInt() == 0;
  
      }
  
@@@ -132,7 -127,7 +132,7 @@@
          dest.writeString(mLocalPath);
          dest.writeString(mMimeType);
          dest.writeInt(mNeedsUpdating ? 1 : 0);
 -        dest.writeInt(mKeepInSync ? 1 : 0);
 +        dest.writeInt(mFavorite ? 1 : 0);
          dest.writeLong(mLastSyncDateForProperties);
          dest.writeLong(mLastSyncDateForData);
          dest.writeString(mEtag);
@@@ -141,7 -136,6 +141,7 @@@
          dest.writeString(mPermissions);
          dest.writeString(mRemoteId);
          dest.writeInt(mNeedsUpdateThumbnail ? 1 : 0);
 +        dest.writeInt(mIsDownloading ? 1 : 0);
      }
  
      /**
@@@ -289,11 -283,11 +289,13 @@@
      /**
       * Sets the name of the file
       * <p/>
--     * Does nothing if the new name is null, empty or includes "/" ; or if the file is the root directory
++     * Does nothing if the new name is null, empty or includes "/" ; or if the file is the root
++     * directory
       */
      public void setFileName(String name) {
          Log_OC.d(TAG, "OCFile name changin from " + mRemotePath);
--        if (name != null && name.length() > 0 && !name.contains(PATH_SEPARATOR) && !mRemotePath.equals(ROOT_PATH)) {
++        if (name != null && name.length() > 0 && !name.contains(PATH_SEPARATOR) &&
++                !mRemotePath.equals(ROOT_PATH)) {
              String parent = (new File(getRemotePath())).getParent();
              parent = (parent.endsWith(PATH_SEPARATOR)) ? parent : parent + PATH_SEPARATOR;
              mRemotePath = parent + name;
@@@ -346,7 -340,7 +348,7 @@@
          mModifiedTimestampAtLastSyncForData = 0;
          mLastSyncDateForProperties = 0;
          mLastSyncDateForData = 0;
 -        mKeepInSync = false;
 +        mFavorite = false;
          mNeedsUpdating = false;
          mEtag = null;
          mShareByLink = false;
@@@ -354,7 -348,6 +356,7 @@@
          mPermissions = null;
          mRemoteId = null;
          mNeedsUpdateThumbnail = false;
 +        mIsDownloading = false;
      }
  
      /**
@@@ -444,17 -437,17 +446,17 @@@
          mLastSyncDateForData = lastSyncDate;
      }
  
 -    public void setKeepInSync(boolean keepInSync) {
 -        mKeepInSync = keepInSync;
 +    public void setFavorite(boolean favorite) {
 +        mFavorite = favorite;
      }
  
 -    public boolean keepInSync() {
 -        return mKeepInSync;
 +    public boolean isFavorite() {
 +        return mFavorite;
      }
  
      @Override
      public int describeContents() {
-         return ((Object) this).hashCode();
+         return super.hashCode();
      }
  
      @Override
@@@ -483,8 -476,8 +485,11 @@@
  
      @Override
      public String toString() {
-         String asString = "[id=%s, name=%s, mime=%s, downloaded=%s, local=%s, remote=%s, parentId=%s, favorite=%s etag=%s]";
-         asString = String.format(asString, Long.valueOf(mId), getFileName(), mMimeType, isDown(), mLocalPath, mRemotePath, Long.valueOf(mParentId), Boolean.valueOf(mFavorite), mEtag);
 -        String asString = "[id=%s, name=%s, mime=%s, downloaded=%s, local=%s, remote=%s, parentId=%s, keepInSync=%s etag=%s]";
 -        asString = String.format(asString, Long.valueOf(mId), getFileName(), mMimeType, isDown(), mLocalPath, mRemotePath, Long.valueOf(mParentId), Boolean.valueOf(mKeepInSync), mEtag);
++        String asString = "[id=%s, name=%s, mime=%s, downloaded=%s, local=%s, remote=%s, " +
++                "parentId=%s, favorite=%s etag=%s]";
++        asString = String.format(asString, Long.valueOf(mId), getFileName(), mMimeType, isDown(),
++                mLocalPath, mRemotePath, Long.valueOf(mParentId), Boolean.valueOf(mFavorite),
++                mEtag);
          return asString;
      }
  
@@@ -540,7 -533,24 +545,26 @@@
       */
      public boolean isImage() {
          return ((mMimeType != null && mMimeType.startsWith("image/")) ||
-                 FileStorageUtils.getMimeTypeFromName(mRemotePath).startsWith("image/"));
+                 getMimeTypeFromName().startsWith("image/"));
+     }
+ 
+     /**
+      * @return 'True' if the file is simple text (e.g. not application-dependent, like .doc or .docx)
+      */
+     public boolean isText() {
 -        return ((mMimeType != null && mMimeType.startsWith("text/")) || getMimeTypeFromName().startsWith("text/"));
++        return ((mMimeType != null && mMimeType.startsWith("text/")) ||
++                getMimeTypeFromName().startsWith("text/"));
+     }
+ 
+     public String getMimeTypeFromName() {
+         String extension = "";
+         int pos = mRemotePath.lastIndexOf('.');
+         if (pos >= 0) {
+             extension = mRemotePath.substring(pos + 1);
+         }
 -        String result = MimeTypeMap.getSingleton().getMimeTypeFromExtension(extension.toLowerCase());
++        String result = MimeTypeMap.getSingleton().
++                getMimeTypeFromExtension(extension.toLowerCase());
+         return (result != null) ? result : "";
      }
  
      public String getPermissions() {
@@@ -558,17 -568,4 +582,17 @@@
      public void setRemoteId(String remoteId) {
          this.mRemoteId = remoteId;
      }
 +
 +    public boolean isDownloading() {
 +        return mIsDownloading;
 +    }
 +
 +    public void setDownloading(boolean isDownloading) {
 +        this.mIsDownloading = isDownloading;
 +    }
 +
 +    public boolean isSynchronizing() {
 +        // TODO real implementation
 +        return false;
 +    }
  }
diff --combined src/com/owncloud/android/ui/activity/FileDisplayActivity.java
index a3d9b104,0fa678d4..d6251420
--- a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
+++ b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
@@@ -1,10 -1,6 +1,10 @@@
 -/* ownCloud Android client application
 +/**
 + *   ownCloud Android client application
 + *
 + *   @author Bartek Przybylski
 + *   @author David A. Velasco
   *   Copyright (C) 2011  Bartek Przybylski
 - *   Copyright (C) 2012-2014 ownCloud Inc.
 + *   Copyright (C) 2015 ownCloud Inc.
   *
   *   This program is free software: you can redistribute it and/or modify
   *   it under the terms of the GNU General Public License version 2,
@@@ -25,11 -21,14 +25,11 @@@ package com.owncloud.android.ui.activit
  import android.accounts.Account;
  import android.accounts.AccountManager;
  import android.accounts.AuthenticatorException;
 -import android.accounts.OperationCanceledException;
 +import android.annotation.TargetApi;
  import android.app.AlertDialog;
 -import android.app.Dialog;
 -import android.app.ProgressDialog;
  import android.content.BroadcastReceiver;
  import android.content.ComponentName;
  import android.content.ContentResolver;
 -import android.content.ContentUris;
  import android.content.Context;
  import android.content.DialogInterface;
  import android.content.Intent;
@@@ -42,23 -41,31 +42,23 @@@ import android.database.Cursor
  import android.net.Uri;
  import android.os.Build;
  import android.os.Bundle;
 -import android.os.Environment;
  import android.os.IBinder;
  import android.preference.PreferenceManager;
 -import android.provider.DocumentsContract;
 -import android.provider.MediaStore;
  import android.provider.OpenableColumns;
  import android.support.v4.app.Fragment;
  import android.support.v4.app.FragmentManager;
  import android.support.v4.app.FragmentTransaction;
 -import android.util.Log;
 +import android.support.v4.view.GravityCompat;
 +import android.view.Menu;
 +import android.view.MenuInflater;
 +import android.view.MenuItem;
  import android.view.View;
 -import android.view.ViewGroup;
 -import android.widget.ArrayAdapter;
 -import android.widget.TextView;
 +import android.view.Window;
  import android.widget.Toast;
  
 -import com.actionbarsherlock.app.ActionBar;
 -import com.actionbarsherlock.app.ActionBar.OnNavigationListener;
 -import com.actionbarsherlock.view.Menu;
 -import com.actionbarsherlock.view.MenuInflater;
 -import com.actionbarsherlock.view.MenuItem;
 -import com.actionbarsherlock.view.Window;
 -import com.owncloud.android.BuildConfig;
  import com.owncloud.android.MainApp;
  import com.owncloud.android.R;
 +import com.owncloud.android.datamodel.FileDataStorageManager;
  import com.owncloud.android.datamodel.OCFile;
  import com.owncloud.android.files.services.FileDownloader;
  import com.owncloud.android.files.services.FileDownloader.FileDownloaderBinder;
@@@ -77,41 -84,46 +77,47 @@@ import com.owncloud.android.lib.common.
  import com.owncloud.android.operations.CreateFolderOperation;
  import com.owncloud.android.operations.CreateShareOperation;
  import com.owncloud.android.operations.MoveFileOperation;
 +import com.owncloud.android.operations.RefreshFolderOperation;
  import com.owncloud.android.operations.RemoveFileOperation;
  import com.owncloud.android.operations.RenameFileOperation;
  import com.owncloud.android.operations.SynchronizeFileOperation;
 -import com.owncloud.android.operations.SynchronizeFolderOperation;
  import com.owncloud.android.operations.UnshareLinkOperation;
  import com.owncloud.android.services.observer.FileObserverService;
  import com.owncloud.android.syncadapter.FileSyncAdapter;
 -import com.owncloud.android.ui.adapter.FileListListAdapter;
 +import com.owncloud.android.ui.dialog.ConfirmationDialogFragment;
  import com.owncloud.android.ui.dialog.CreateFolderDialogFragment;
  import com.owncloud.android.ui.dialog.SslUntrustedCertDialog;
  import com.owncloud.android.ui.dialog.SslUntrustedCertDialog.OnSslUntrustedCertListener;
 +import com.owncloud.android.ui.dialog.UploadSourceDialogFragment;
  import com.owncloud.android.ui.fragment.FileDetailFragment;
  import com.owncloud.android.ui.fragment.FileFragment;
  import com.owncloud.android.ui.fragment.OCFileListFragment;
  import com.owncloud.android.ui.preview.PreviewImageActivity;
  import com.owncloud.android.ui.preview.PreviewImageFragment;
  import com.owncloud.android.ui.preview.PreviewMediaFragment;
+ import com.owncloud.android.ui.preview.PreviewTextFragment;
  import com.owncloud.android.ui.preview.PreviewVideoActivity;
  import com.owncloud.android.utils.DisplayUtils;
  import com.owncloud.android.utils.ErrorMessageAdapter;
 +import com.owncloud.android.utils.FileStorageUtils;
  import com.owncloud.android.utils.UriUtils;
  
  import java.io.File;
 +
+ import java.io.IOException;
+ 
+ 
 +
  /**
   * Displays, what files the user has available in his ownCloud.
 - *
 - * @author Bartek Przybylski
 - * @author David A. Velasco
   */
  
 -public class FileDisplayActivity extends HookActivity implements
 -        FileFragment.ContainerActivity, OnNavigationListener,
 +public class FileDisplayActivity extends HookActivity
 +        implements FileFragment.ContainerActivity,
          OnSslUntrustedCertListener, OnEnforceableRefreshListener {
  
 -    private ArrayAdapter<String> mDirectories;
++
+ 
      private SyncBroadcastReceiver mSyncBroadcastReceiver;
      private UploadFinishReceiver mUploadFinishReceiver;
      private DownloadFinishReceiver mDownloadFinishReceiver;
@@@ -125,10 -137,14 +131,10 @@@
      private static final String KEY_SYNC_IN_PROGRESS = "SYNC_IN_PROGRESS";
      private static final String KEY_WAITING_TO_SEND = "WAITING_TO_SEND";
  
 -    public static final int DIALOG_SHORT_WAIT = 0;
 -    private static final int DIALOG_CHOOSE_UPLOAD_SOURCE = 1;
 -    private static final int DIALOG_CERT_NOT_SAVED = 2;
 -
      public static final String ACTION_DETAILS = "com.owncloud.android.ui.activity.action.DETAILS";
  
 -    private static final int ACTION_SELECT_CONTENT_FROM_APPS = 1;
 -    private static final int ACTION_SELECT_MULTIPLE_FILES = 2;
 +    public static final int ACTION_SELECT_CONTENT_FROM_APPS = 1;
 +    public static final int ACTION_SELECT_MULTIPLE_FILES = 2;
      public static final int ACTION_MOVE_FILES = 3;
  
      private static final String TAG = FileDisplayActivity.class.getSimpleName();
@@@ -137,53 -153,49 +143,51 @@@
      private static final String TAG_SECOND_FRAGMENT = "SECOND_FRAGMENT";
  
      private OCFile mWaitingToPreview;
-     
+ 
      private boolean mSyncInProgress = false;
  
 -    private String DIALOG_UNTRUSTED_CERT;
 +    private static String DIALOG_UNTRUSTED_CERT = "DIALOG_UNTRUSTED_CERT";
 +    private static String DIALOG_CREATE_FOLDER = "DIALOG_CREATE_FOLDER";
 +    private static String DIALOG_UPLOAD_SOURCE = "DIALOG_UPLOAD_SOURCE";
 +    private static String DIALOG_CERT_NOT_SAVED = "DIALOG_CERT_NOT_SAVED";
  
      private OCFile mWaitingToSend;
  
 +    
      @Override
      protected void onCreate(Bundle savedInstanceState) {
 -        Log_OC.d(TAG, "onCreate() start");
 +        Log_OC.v(TAG, "onCreate() start");
          requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);
  
 -        super.onCreate(savedInstanceState); // this calls onAccountChanged() when ownCloud Account is valid
 +        super.onCreate(savedInstanceState); // this calls onAccountChanged() when ownCloud Account
 +                                            // is valid
  
 -        // PIN CODE request ;  best location is to decide, let's try this first
 -        if (getIntent().getAction() != null && getIntent().getAction().equals(Intent.ACTION_MAIN) && savedInstanceState == null) {
 -            requestPinCode();
 -        } else if (getIntent().getAction() == null && savedInstanceState == null) {
 -            requestPinCode();
 -        }
 -
 -        /// grant that FileObserverService is watching favourite files
 +        /// grant that FileObserverService is watching favorite files
          if (savedInstanceState == null) {
              Intent initObserversIntent = FileObserverService.makeInitIntent(this);
              startService(initObserversIntent);
          }
-         
+ 
          /// Load of saved instance state
 -        if (savedInstanceState != null) {
 -            mWaitingToPreview = (OCFile) savedInstanceState.getParcelable(FileDisplayActivity.KEY_WAITING_TO_PREVIEW);
 +        if(savedInstanceState != null) {
 +            mWaitingToPreview = (OCFile) savedInstanceState.getParcelable(
 +                    FileDisplayActivity.KEY_WAITING_TO_PREVIEW);
              mSyncInProgress = savedInstanceState.getBoolean(KEY_SYNC_IN_PROGRESS);
 -            mWaitingToSend = (OCFile) savedInstanceState.getParcelable(FileDisplayActivity.KEY_WAITING_TO_SEND);
 -
 +            mWaitingToSend = (OCFile) savedInstanceState.getParcelable(
 +                    FileDisplayActivity.KEY_WAITING_TO_SEND);
-            
          } else {
              mWaitingToPreview = null;
              mSyncInProgress = false;
              mWaitingToSend = null;
-         }        
+         }
  
          /// USER INTERFACE
  
          // Inflate and set the layout view
          setContentView(R.layout.files);
 +        
 +        // Navigation Drawer
 +        initDrawer();
- 
          mDualPane = getResources().getBoolean(R.bool.large_land_layout);
          mLeftFragmentContainer = findViewById(R.id.left_fragment_container);
          mRightFragmentContainer = findViewById(R.id.right_fragment_container);
@@@ -192,57 -204,46 +196,57 @@@
          }
  
          // Action bar setup
 -        mDirectories = new CustomArrayAdapter<String>(this, R.layout.sherlock_spinner_dropdown_item);
 -        getSupportActionBar().setHomeButtonEnabled(true);       // mandatory since Android ICS, according to the official documentation
 -        setSupportProgressBarIndeterminateVisibility(mSyncInProgress /*|| mRefreshSharesInProgress*/);    // always AFTER setContentView(...) ; to work around bug in its implementation
 +        getSupportActionBar().setHomeButtonEnabled(true);       // mandatory since Android ICS,
 +                                                                // according to the official
 +                                                                // documentation
 +
 +        setSupportProgressBarIndeterminateVisibility(mSyncInProgress
 +        /*|| mRefreshSharesInProgress*/);
 +        // always AFTER setContentView(...) ; to work around bug in its implementation
-         
+ 
          setBackgroundText();
  
 -        Log_OC.d(TAG, "onCreate() end");
 +        Log_OC.v(TAG, "onCreate() end");
      }
  
      @Override
      protected void onStart() {
 +        Log_OC.v(TAG, "onStart() start");
          super.onStart();
          getSupportActionBar().setIcon(DisplayUtils.getSeasonalIconId());
 +        Log_OC.v(TAG, "onStart() end");
      }
  
      @Override
      protected void onDestroy() {
 +        Log_OC.v(TAG, "onDestroy() start");
          super.onDestroy();
 +        Log_OC.v(TAG, "onDestroy() end");
      }
  
      /**
-      *  Called when the ownCloud {@link Account} associated to the Activity was just updated.
-      */ 
+      * Called when the ownCloud {@link Account} associated to the Activity was just updated.
+      */
      @Override
      protected void onAccountSet(boolean stateWasRecovered) {
          super.onAccountSet(stateWasRecovered);
          if (getAccount() != null) {
 -            /// Check whether the 'main' OCFile handled by the Activity is contained in the current Account
 +            /// Check whether the 'main' OCFile handled by the Activity is contained in the
 +            // current Account
              OCFile file = getFile();
              // get parent from path
              String parentPath = "";
              if (file != null) {
                  if (file.isDown() && file.getLastSyncDateForProperties() == 0) {
 -                    // upload in progress - right now, files are not inserted in the local cache until the upload is successful
 -                    // get parent from path
 -                    parentPath = file.getRemotePath().substring(0, file.getRemotePath().lastIndexOf(file.getFileName()));
 -                    if (getStorageManager().getFileByPath(parentPath) == null)
 +                    // upload in progress - right now, files are not inserted in the local
 +                    // cache until the upload is successful get parent from path
 +                    parentPath = file.getRemotePath().substring(0,
 +                            file.getRemotePath().lastIndexOf(file.getFileName()));
 +                    if (getStorageManager().getFileByPath(parentPath) ==  null)
                          file = null; // not able to know the directory where the file is uploading
                  } else {
 -                    file = getStorageManager().getFileByPath(file.getRemotePath());   // currentDir = null if not in the current Account
 +                    file = getStorageManager().getFileByPath(file.getRemotePath());
 +                    // currentDir = null if not in the current Account
                  }
              }
              if (file == null) {
@@@ -250,51 -251,68 +254,53 @@@
                  file = getStorageManager().getFileByPath(OCFile.ROOT_PATH);  // never returns null
              }
              setFile(file);
-             
 -            setNavigationListWithFolder(file);
+ 
              if (!stateWasRecovered) {
 -                Log_OC.e(TAG, "Initializing Fragments in onAccountChanged..");
 +                Log_OC.d(TAG, "Initializing Fragments in onAccountChanged..");
                  initFragmentsWithFile();
                  if (file.isFolder()) {
                      startSyncFolderOperation(file, false);
                  }
-                 
+ 
              } else {
                  updateFragmentsVisibility(!file.isFolder());
 -                updateNavigationElementsInActionBar(file.isFolder() ? null : file);
 -            }
 -        }
 -    }
 -
 -
 -    private void setNavigationListWithFolder(OCFile file) {
 -        mDirectories.clear();
 -        OCFile fileIt = file;
 -        String parentPath;
 -        while (fileIt != null && fileIt.getFileName() != OCFile.ROOT_PATH) {
 -            if (fileIt.isFolder()) {
 -                mDirectories.add(fileIt.getFileName());
 +                updateActionBarTitleAndHomeButton(file.isFolder() ? null : file);
              }
 -            // get parent from path
 -            parentPath = fileIt.getRemotePath().substring(0, fileIt.getRemotePath().lastIndexOf(fileIt.getFileName()));
 -            fileIt = getStorageManager().getFileByPath(parentPath);
          }
 -        mDirectories.add(OCFile.PATH_SEPARATOR);
      }
  
--
      private void createMinFragments() {
          OCFileListFragment listOfFiles = new OCFileListFragment();
          FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
          transaction.add(R.id.left_fragment_container, listOfFiles, TAG_LIST_OF_FILES);
          transaction.commit();
      }
-     
+ 
      private void initFragmentsWithFile() {
          if (getAccount() != null && getFile() != null) {
              /// First fragment
-             OCFileListFragment listOfFiles = getListOfFilesFragment(); 
+             OCFileListFragment listOfFiles = getListOfFilesFragment();
              if (listOfFiles != null) {
                  listOfFiles.listDirectory(getCurrentDir());
 +                // TODO Enable when "On Device" is recovered
 +                // listOfFiles.listDirectory(getCurrentDir(), MainApp.getOnlyOnDevice());
++
              } else {
                  Log_OC.e(TAG, "Still have a chance to lose the initializacion of list fragment >(");
              }
-             
+ 
              /// Second fragment
-             OCFile file = getFile(); 
+             OCFile file = getFile();
              Fragment secondFragment = chooseInitialSecondFragment(file);
              if (secondFragment != null) {
                  setSecondFragment(secondFragment);
                  updateFragmentsVisibility(true);
 -                updateNavigationElementsInActionBar(file);
 +                updateActionBarTitleAndHomeButton(file);
-                 
+ 
              } else {
                  cleanSecondFragment();
+                 if (file.isDown() && PreviewTextFragment.canBePreviewed(file))
+                     startTextPreview(file);
              }
  
          } else {
@@@ -311,19 -329,16 +317,21 @@@
      private Fragment chooseInitialSecondFragment(OCFile file) {
          Fragment secondFragment = null;
          if (file != null && !file.isFolder()) {
-             if (file.isDown() && PreviewMediaFragment.canBePreviewed(file) 
+             if (file.isDown() && PreviewMediaFragment.canBePreviewed(file)
                      && file.getLastSyncDateForProperties() > 0  // temporal fix
                      ) {
 -                int startPlaybackPosition = getIntent().getIntExtra(PreviewVideoActivity.EXTRA_START_POSITION, 0);
 -                boolean autoplay = getIntent().getBooleanExtra(PreviewVideoActivity.EXTRA_AUTOPLAY, true);
 -                secondFragment = new PreviewMediaFragment(file, getAccount(), startPlaybackPosition, autoplay);
 +                int startPlaybackPosition =
 +                        getIntent().getIntExtra(PreviewVideoActivity.EXTRA_START_POSITION, 0);
 +                boolean autoplay =
 +                        getIntent().getBooleanExtra(PreviewVideoActivity.EXTRA_AUTOPLAY, true);
 +                secondFragment = new PreviewMediaFragment(file, getAccount(),
 +                        startPlaybackPosition, autoplay);
  
+             } else if (file.isDown() && PreviewTextFragment.canBePreviewed(file)) {
+                 secondFragment = null;
 -            } else secondFragment = new FileDetailFragment(file, getAccount());
 +            } else {
-                 secondFragment = FileDetailFragment.newInstance(file, getAccount());
-             }
++            secondFragment = FileDetailFragment.newInstance(file, getAccount());
++        }
          }
          return secondFragment;
      }
@@@ -332,10 -347,10 +340,10 @@@
      /**
       * Replaces the second fragment managed by the activity with the received as
       * a parameter.
-      * 
-      * Assumes never will be more than two fragments managed at the same time. 
-      * 
-      * @param fragment      New second Fragment to set.
+      * <p/>
+      * Assumes never will be more than two fragments managed at the same time.
+      *
+      * @param fragment New second Fragment to set.
       */
      private void setSecondFragment(Fragment fragment) {
          FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
@@@ -373,20 -388,18 +381,20 @@@
  
  
      private OCFileListFragment getListOfFilesFragment() {
 -        Fragment listOfFiles = getSupportFragmentManager().findFragmentByTag(FileDisplayActivity.TAG_LIST_OF_FILES);
 +        Fragment listOfFiles = getSupportFragmentManager().findFragmentByTag(
 +                FileDisplayActivity.TAG_LIST_OF_FILES);
          if (listOfFiles != null) {
-             return (OCFileListFragment)listOfFiles;
+             return (OCFileListFragment) listOfFiles;
          }
          Log_OC.wtf(TAG, "Access to unexisting list of files fragment!!");
          return null;
      }
  
      public FileFragment getSecondFragment() {
 -        Fragment second = getSupportFragmentManager().findFragmentByTag(FileDisplayActivity.TAG_SECOND_FRAGMENT);
 +        Fragment second = getSupportFragmentManager().findFragmentByTag(
 +                FileDisplayActivity.TAG_SECOND_FRAGMENT);
          if (second != null) {
-             return (FileFragment)second;
+             return (FileFragment) second;
          }
          return null;
      }
@@@ -399,28 -412,23 +407,28 @@@
              tr.commit();
          }
          updateFragmentsVisibility(false);
 -        updateNavigationElementsInActionBar(null);
 +        updateActionBarTitleAndHomeButton(null);
      }
  
      protected void refreshListOfFilesFragment() {
          OCFileListFragment fileListFragment = getListOfFilesFragment();
          if (fileListFragment != null) {
              fileListFragment.listDirectory();
 +            // TODO Enable when "On Device" is recovered ?
 +            // fileListFragment.listDirectory(MainApp.getOnlyOnDevice());
          }
      }
  
 -    protected void refreshSecondFragment(String downloadEvent, String downloadedRemotePath, boolean success) {
 +    protected void refreshSecondFragment(String downloadEvent, String downloadedRemotePath,
 +                                         boolean success) {
          FileFragment secondFragment = getSecondFragment();
 -        boolean waitedPreview = (mWaitingToPreview != null && mWaitingToPreview.getRemotePath().equals(downloadedRemotePath));
 +        boolean waitedPreview = (mWaitingToPreview != null &&
 +                mWaitingToPreview.getRemotePath().equals(downloadedRemotePath));
          if (secondFragment != null && secondFragment instanceof FileDetailFragment) {
              FileDetailFragment detailsFragment = (FileDetailFragment) secondFragment;
              OCFile fileInFragment = detailsFragment.getFile();
 -            if (fileInFragment != null && !downloadedRemotePath.equals(fileInFragment.getRemotePath())) {
 +            if (fileInFragment != null &&
 +                    !downloadedRemotePath.equals(fileInFragment.getRemotePath())) {
                  // the user browsed to other file ; forget the automatic preview 
                  mWaitingToPreview = null;
  
@@@ -434,12 -442,13 +442,15 @@@
                  boolean detailsFragmentChanged = false;
                  if (waitedPreview) {
                      if (success) {
 -                        mWaitingToPreview = getStorageManager().getFileById(mWaitingToPreview.getFileId());   // update the file from database, for the local storage path
 +                        mWaitingToPreview = getStorageManager().getFileById(
 +                                mWaitingToPreview.getFileId());   // update the file from database,
 +                                                                  // for the local storage path
                          if (PreviewMediaFragment.canBePreviewed(mWaitingToPreview)) {
                              startMediaPreview(mWaitingToPreview, 0, true);
                              detailsFragmentChanged = true;
+                         } else if (PreviewTextFragment.canBePreviewed(mWaitingToPreview)) {
+                             startTextPreview(mWaitingToPreview);
+                             detailsFragmentChanged = true;
                          } else {
                              getFileOperationsHelper().openFile(mWaitingToPreview);
                          }
@@@ -455,22 -464,20 +466,22 @@@
  
      @Override
      public boolean onPrepareOptionsMenu(Menu menu) {
 -        if (BuildConfig.DEBUG) {
 -            menu.findItem(R.id.action_logger).setVisible(true);
 -        } else {
 -            menu.findItem(R.id.action_logger).setVisible(false);
 -        }
 +        boolean drawerOpen = mDrawerLayout.isDrawerOpen(GravityCompat.START);
 +        menu.findItem(R.id.action_upload).setVisible(!drawerOpen);
 +        menu.findItem(R.id.action_create_dir).setVisible(!drawerOpen);
 +        menu.findItem(R.id.action_sort).setVisible(!drawerOpen);
 +        menu.findItem(R.id.action_sync_account).setVisible(!drawerOpen);
 +        
          return super.onPrepareOptionsMenu(menu);
      }
  
      @Override
      public boolean onCreateOptionsMenu(Menu menu) {
 -        MenuInflater inflater = getSherlock().getMenuInflater();
 +        MenuInflater inflater = getMenuInflater();
          inflater.inflate(R.menu.main_menu, menu);
          return true;
      }
 +    
  
      @Override
      public boolean onOptionsItemSelected(MenuItem item) {
@@@ -479,32 -486,7 +490,32 @@@
              case R.id.action_create_dir: {
                  CreateFolderDialogFragment dialog =
                          CreateFolderDialogFragment.newInstance(getCurrentDir());
 -                dialog.show(getSupportFragmentManager(), "createdirdialog");
 +                dialog.show(getSupportFragmentManager(), DIALOG_CREATE_FOLDER);
 +                break;
 +            }
++
 +            case R.id.action_sync_account: {
 +                startSynchronization();
 +                break;
 +            }
 +            case R.id.action_upload: {
 +                UploadSourceDialogFragment dialog =
 +                        UploadSourceDialogFragment.newInstance(getAccount());
 +                dialog.show(getSupportFragmentManager(), DIALOG_UPLOAD_SOURCE);
- 
 +                break;
 +            }
 +            case android.R.id.home: {
 +                FileFragment second = getSecondFragment();
 +                OCFile currentDir = getCurrentDir();
 +                if (mDrawerLayout.isDrawerOpen(GravityCompat.START)) {
 +                    mDrawerLayout.closeDrawer(GravityCompat.START);
 +                } else if((currentDir != null && currentDir.getParentId() != 0) ||
 +                        (second != null && second.getFile() != null)) {
 +                    onBackPressed();
 +
 +                } else {
 +                    mDrawerLayout.openDrawer(GravityCompat.START);
 +                }
                  break;
              }
              case R.id.action_sort: {
@@@ -513,51 -495,82 +524,51 @@@
  
                  // Read sorting order, default to sort by name ascending
                  Integer sortOrder = appPreferences
 -                        .getInt("sortOrder", FileListListAdapter.SORT_NAME);
 +                        .getInt("sortOrder", FileStorageUtils.SORT_NAME);
  
                  AlertDialog.Builder builder = new AlertDialog.Builder(this);
                  builder.setTitle(R.string.actionbar_sort_title)
 -                        .setSingleChoiceItems(R.array.actionbar_sortby, sortOrder, new DialogInterface.OnClickListener() {
 +                        .setSingleChoiceItems(R.array.actionbar_sortby, sortOrder ,
 +                                new DialogInterface.OnClickListener() {
                              public void onClick(DialogInterface dialog, int which) {
 -
 -                                switch (which) {
 +                                switch (which){
                                      case 0:
                                          sortByName(true);
                                          break;
                                      case 1:
                                          sortByDate(false);
                                          break;
 -
 -// TODO re-enable when server-side folder size calculation is available                       
 -//                    case 2:
 -//                        sortBySize(false);
 -//                        break;
                                  }
  
                                  dialog.dismiss();
 -
                              }
                          });
                  builder.create().show();
                  break;
              }
 -            case R.id.action_sync_account: {
 -                startSynchronization();
 -                break;
 -            }
 -            case R.id.action_upload: {
 -                showDialog(DIALOG_CHOOSE_UPLOAD_SOURCE);
 -                break;
 -            }
 -            case R.id.action_settings: {
 -                Intent settingsIntent = new Intent(this, Preferences.class);
 -                startActivity(settingsIntent);
 -                break;
 -            }
 -            case R.id.action_logger: {
 -                Intent loggerIntent = new Intent(getApplicationContext(), LogHistoryActivity.class);
 -                startActivity(loggerIntent);
 -                break;
 -            }
 -            case android.R.id.home: {
 -                FileFragment second = getSecondFragment();
 -                OCFile currentDir = getCurrentDir();
 -                if ((currentDir != null && currentDir.getParentId() != 0) ||
 -                        (second != null && second.getFile() != null)) {
 -                    onBackPressed();
 -
 -                }
 -                break;
 -            }
 -            default:
 -                retval = super.onOptionsItemSelected(item);
 +        default:
 +            retval = super.onOptionsItemSelected(item);
          }
          return retval;
      }
  
      private void startSynchronization() {
 -        Log_OC.e(TAG, "Got to start sync");
 +        Log_OC.d(TAG, "Got to start sync");
          if (android.os.Build.VERSION.SDK_INT < android.os.Build.VERSION_CODES.KITKAT) {
 -            Log_OC.e(TAG, "Canceling all syncs for " + MainApp.getAuthority());
 -            ContentResolver.cancelSync(null, MainApp.getAuthority());   // cancel the current synchronizations of any ownCloud account
 +            Log_OC.d(TAG, "Canceling all syncs for " + MainApp.getAuthority());
 +            ContentResolver.cancelSync(null, MainApp.getAuthority());
 +            // cancel the current synchronizations of any ownCloud account
              Bundle bundle = new Bundle();
              bundle.putBoolean(ContentResolver.SYNC_EXTRAS_MANUAL, true);
              bundle.putBoolean(ContentResolver.SYNC_EXTRAS_EXPEDITED, true);
 -            Log_OC.e(TAG, "Requesting sync for " + getAccount().name + " at " + MainApp.getAuthority());
 +            Log_OC.d(TAG, "Requesting sync for " + getAccount().name + " at " +
 +                    MainApp.getAuthority());
              ContentResolver.requestSync(
                      getAccount(),
                      MainApp.getAuthority(), bundle);
          } else {
 -            Log_OC.e(TAG, "Requesting sync for " + getAccount().name + " at " + MainApp.getAuthority() + " with new API");
 +            Log_OC.d(TAG, "Requesting sync for " + getAccount().name + " at " +
 +                    MainApp.getAuthority() + " with new API");
              SyncRequest.Builder builder = new SyncRequest.Builder();
              builder.setSyncAdapter(getAccount(), MainApp.getAuthority());
              builder.setExpedited(true);
@@@ -573,56 -586,68 +584,56 @@@
          }
      }
  
 -
 -    @Override
 -    public boolean onNavigationItemSelected(int itemPosition, long itemId) {
 -        if (itemPosition != 0) {
 -            String targetPath = "";
 -            for (int i = itemPosition; i < mDirectories.getCount() - 1; i++) {
 -                targetPath = mDirectories.getItem(i) + OCFile.PATH_SEPARATOR + targetPath;
 -            }
 -            targetPath = OCFile.PATH_SEPARATOR + targetPath;
 -            OCFile targetFolder = getStorageManager().getFileByPath(targetPath);
 -            if (targetFolder != null) {
 -                browseTo(targetFolder);
 -            }
 -
 -            // the next operation triggers a new call to this method, but it's necessary to 
 -            // ensure that the name exposed in the action bar is the current directory when the 
 -            // user selected it in the navigation list
 -            if (getSupportActionBar().getNavigationMode() == ActionBar.NAVIGATION_MODE_LIST && itemPosition != 0)
 -                getSupportActionBar().setSelectedNavigationItem(0);
 -        }
 -        return true;
 -    }
 -
      /**
       * Called, when the user selected something for uploading
 +     *
       */
 +    @TargetApi(Build.VERSION_CODES.JELLY_BEAN)
 +    @Override
      protected void onActivityResult(int requestCode, int resultCode, Intent data) {
 -        super.onActivityResult(requestCode, resultCode, data);
 -
 -        if (requestCode == ACTION_SELECT_CONTENT_FROM_APPS && (resultCode == RESULT_OK || resultCode == UploadFilesActivity.RESULT_OK_AND_MOVE)) {
 -            requestSimpleUpload(data, resultCode);
  
 -        } else if (requestCode == ACTION_SELECT_MULTIPLE_FILES && (resultCode == RESULT_OK || resultCode == UploadFilesActivity.RESULT_OK_AND_MOVE)) {
 +        if (requestCode == ACTION_SELECT_CONTENT_FROM_APPS && (resultCode == RESULT_OK ||
 +                resultCode == UploadFilesActivity.RESULT_OK_AND_MOVE)) {
 +            //getClipData is only supported on api level 16+, Jelly Bean
 +            if (data.getData() == null && Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN){
 +                for( int i = 0; i < data.getClipData().getItemCount(); i++){
 +                    Intent intent = new Intent();
 +                    intent.setData(data.getClipData().getItemAt(i).getUri());
 +                    requestSimpleUpload(intent, resultCode);
 +                }
 +            }else {
 +                requestSimpleUpload(data, resultCode);
 +            }
 +        } else if (requestCode == ACTION_SELECT_MULTIPLE_FILES && (resultCode == RESULT_OK ||
 +                resultCode == UploadFilesActivity.RESULT_OK_AND_MOVE)) {
              requestMultipleUpload(data, resultCode);
  
-         } else if (requestCode == ACTION_MOVE_FILES && resultCode == RESULT_OK){
+         } else if (requestCode == ACTION_MOVE_FILES && resultCode == RESULT_OK) {
  
              final Intent fData = data;
-             final int fResultCode = resultCode; 
+             final int fResultCode = resultCode;
              getHandler().postDelayed(
-                 new Runnable() {
-                     @Override
-                     public void run() {
-                         requestMoveOperation(fData, fResultCode);
-                     }
-                 }, 
-                 DELAY_TO_REQUEST_OPERATION_ON_ACTIVITY_RESULTS
+                     new Runnable() {
+                         @Override
+                         public void run() {
+                             requestMoveOperation(fData, fResultCode);
+                         }
+                     },
+                     DELAY_TO_REQUEST_OPERATION_ON_ACTIVITY_RESULTS
              );
 +
 +        } else {
 +            super.onActivityResult(requestCode, resultCode, data);
          }
 +
      }
  
      private void requestMultipleUpload(Intent data, int resultCode) {
          String[] filePaths = data.getStringArrayExtra(UploadFilesActivity.EXTRA_CHOSEN_FILES);
          if (filePaths != null) {
              String[] remotePaths = new String[filePaths.length];
 -            String remotePathBase = "";
 -            for (int j = mDirectories.getCount() - 2; j >= 0; --j) {
 -                remotePathBase += OCFile.PATH_SEPARATOR + mDirectories.getItem(j);
 -            }
 -            if (!remotePathBase.endsWith(OCFile.PATH_SEPARATOR))
 -                remotePathBase += OCFile.PATH_SEPARATOR;
 -            for (int j = 0; j < remotePaths.length; j++) {
 +            String remotePathBase = getCurrentDir().getRemotePath();
 +            for (int j = 0; j< remotePaths.length; j++) {
                  remotePaths[j] = remotePathBase + (new File(filePaths[j])).getName();
              }
  
@@@ -637,8 -662,7 +648,8 @@@
  
          } else {
              Log_OC.d(TAG, "User clicked on 'Update' with no selection");
 -            Toast t = Toast.makeText(this, getString(R.string.filedisplay_no_file_selected), Toast.LENGTH_LONG);
 +            Toast t = Toast.makeText(this, getString(R.string.filedisplay_no_file_selected),
 +                    Toast.LENGTH_LONG);
              t.show();
              return;
          }
@@@ -646,7 -670,7 +657,7 @@@
  
  
      private void requestSimpleUpload(Intent data, int resultCode) {
 -        String filepath = null;
 +        String filePath = null;
          String mimeType = null;
  
          Uri selectedImageUri = data.getData();
@@@ -654,71 -678,75 +665,71 @@@
          try {
              mimeType = getContentResolver().getType(selectedImageUri);
  
 -            String filemanagerstring = selectedImageUri.getPath();
 -            String selectedImagePath = getPath(selectedImageUri);
 +            String fileManagerString = selectedImageUri.getPath();
 +            String selectedImagePath = UriUtils.getLocalPath(selectedImageUri, this);
  
              if (selectedImagePath != null)
 -                filepath = selectedImagePath;
 +                filePath = selectedImagePath;
              else
 -                filepath = filemanagerstring;
 +                filePath = fileManagerString;
  
          } catch (Exception e) {
 -            Log_OC.e(TAG, "Unexpected exception when trying to read the result of Intent.ACTION_GET_CONTENT", e);
 -            e.printStackTrace();
 +            Log_OC.e(TAG, "Unexpected exception when trying to read the result of " +
 +                    "Intent.ACTION_GET_CONTENT", e);
  
          } finally {
 -            if (filepath == null) {
 -                Log_OC.e(TAG, "Couldnt resolve path to file");
 -                Toast t = Toast.makeText(this, getString(R.string.filedisplay_unexpected_bad_get_content), Toast.LENGTH_LONG);
 +            if (filePath == null) {
 +                Log_OC.e(TAG, "Couldn't resolve path to file");
 +                Toast t = Toast.makeText(
 +                        this, getString(R.string.filedisplay_unexpected_bad_get_content),
 +                        Toast.LENGTH_LONG
 +                );
                  t.show();
                  return;
              }
          }
  
          Intent i = new Intent(this, FileUploader.class);
 -        i.putExtra(FileUploader.KEY_ACCOUNT,
 -                getAccount());
 -        String remotepath = new String();
 -        for (int j = mDirectories.getCount() - 2; j >= 0; --j) {
 -            remotepath += OCFile.PATH_SEPARATOR + mDirectories.getItem(j);
 -        }
 -        if (!remotepath.endsWith(OCFile.PATH_SEPARATOR))
 -            remotepath += OCFile.PATH_SEPARATOR;
 -
 -        if (filepath.startsWith(UriUtils.URI_CONTENT_SCHEME)) {
 -
 -            Cursor cursor = MainApp.getAppContext().getContentResolver()
 -                    .query(Uri.parse(filepath), null, null, null, null, null);
 +        i.putExtra(FileUploader.KEY_ACCOUNT, getAccount());
 +        OCFile currentDir = getCurrentDir();
 +        String remotePath =  (currentDir != null) ? currentDir.getRemotePath() : OCFile.ROOT_PATH;
  
 +        if (filePath.startsWith(UriUtils.URI_CONTENT_SCHEME)) {
 +            Cursor cursor = getContentResolver().query(Uri.parse(filePath), null, null, null, null);
              try {
                  if (cursor != null && cursor.moveToFirst()) {
 -                    String displayName = cursor.getString(
 -                            cursor.getColumnIndex(OpenableColumns.DISPLAY_NAME));
 -                    Log.i(TAG, "Display Name: " + displayName + "; mimeType: " + mimeType);
 +                    String displayName = cursor.getString(cursor.getColumnIndex(
 +                            OpenableColumns.DISPLAY_NAME));
 +                    Log_OC.v(TAG, "Display Name: " + displayName );
  
                      displayName.replace(File.separatorChar, '_');
                      displayName.replace(File.pathSeparatorChar, '_');
 -                    remotepath += displayName + DisplayUtils.getComposedFileExtension(filepath);
 +                    remotePath += displayName + DisplayUtils.getComposedFileExtension(filePath);
  
                  }
 +                // and what happens in case of error?; wrong target name for the upload
              } finally {
                  cursor.close();
              }
  
          } else {
 -            remotepath += new File(filepath).getName();
 +            remotePath += new File(filePath).getName();
          }
  
 -        i.putExtra(FileUploader.KEY_LOCAL_FILE, filepath);
 -        i.putExtra(FileUploader.KEY_REMOTE_FILE, remotepath);
 +        i.putExtra(FileUploader.KEY_LOCAL_FILE, filePath);
 +        i.putExtra(FileUploader.KEY_REMOTE_FILE, remotePath);
          i.putExtra(FileUploader.KEY_MIME_TYPE, mimeType);
          i.putExtra(FileUploader.KEY_UPLOAD_TYPE, FileUploader.UPLOAD_SINGLE_FILE);
          if (resultCode == UploadFilesActivity.RESULT_OK_AND_MOVE)
 -            i.putExtra(FileUploader.KEY_LOCAL_BEHAVIOUR, FileUploader.LOCAL_BEHAVIOUR_MOVE);
 +        i.putExtra(FileUploader.KEY_LOCAL_BEHAVIOUR, FileUploader.LOCAL_BEHAVIOUR_MOVE);
          startService(i);
      }
  
      /**
       * Request the operation for moving the file/folder from one path to another
-      * 
-      * @param data              Intent received
-      * @param resultCode        Result code received
+      *
+      * @param data       Intent received
+      * @param resultCode Result code received
       */
      private void requestMoveOperation(Intent data, int resultCode) {
          OCFile folderToMoveAt = (OCFile) data.getParcelableExtra(FolderPickerActivity.EXTRA_FOLDER);
@@@ -728,15 -756,17 +739,15 @@@
  
      @Override
      public void onBackPressed() {
-         OCFileListFragment listOfFiles = getListOfFilesFragment(); 
+         OCFileListFragment listOfFiles = getListOfFilesFragment();
          if (mDualPane || getSecondFragment() == null) {
 +            OCFile currentDir = getCurrentDir();
 +            if (currentDir == null || currentDir.getParentId() == FileDataStorageManager.ROOT_PARENT_ID) {
 +                finish();
 +                return;
 +            }
              if (listOfFiles != null) {  // should never be null, indeed
 -                if (mDirectories.getCount() <= 1) {
 -                    finish();
 -                    return;
 -                }
 -                int levelsUp = listOfFiles.onBrowseUp();
 -                for (int i = 0; i < levelsUp && mDirectories.getCount() > 1; i++) {
 -                    popDirname();
 -                }
 +                listOfFiles.onBrowseUp();
              }
          }
          if (listOfFiles != null) {  // should never be null, indeed
@@@ -748,30 -778,23 +759,27 @@@
  
      @Override
      protected void onSaveInstanceState(Bundle outState) {
 -        // responsibility of restore is preferred in onCreate() before than in onRestoreInstanceState when there are Fragments involved
 -        Log_OC.e(TAG, "onSaveInstanceState() start");
 +        // responsibility of restore is preferred in onCreate() before than in
 +        // onRestoreInstanceState when there are Fragments involved
 +        Log_OC.v(TAG, "onSaveInstanceState() start");
          super.onSaveInstanceState(outState);
          outState.putParcelable(FileDisplayActivity.KEY_WAITING_TO_PREVIEW, mWaitingToPreview);
          outState.putBoolean(FileDisplayActivity.KEY_SYNC_IN_PROGRESS, mSyncInProgress);
 -        //outState.putBoolean(FileDisplayActivity.KEY_REFRESH_SHARES_IN_PROGRESS, mRefreshSharesInProgress);
 +        //outState.putBoolean(FileDisplayActivity.KEY_REFRESH_SHARES_IN_PROGRESS,
 +        // mRefreshSharesInProgress);
          outState.putParcelable(FileDisplayActivity.KEY_WAITING_TO_SEND, mWaitingToSend);
  
 -        Log_OC.d(TAG, "onSaveInstanceState() end");
 +        Log_OC.v(TAG, "onSaveInstanceState() end");
      }
-     
  
  
      @Override
      protected void onResume() {
 +        Log_OC.v(TAG, "onResume() start");
          super.onResume();
- 
 -        Log_OC.e(TAG, "onResume() start");
 +        // refresh Navigation Drawer account list
 +        mNavigationDrawerAdapter.updateAccountList();
  
- 
          // refresh list of files
          refreshListOfFilesFragment();
  
@@@ -779,12 -802,11 +787,12 @@@
          IntentFilter syncIntentFilter = new IntentFilter(FileSyncAdapter.EVENT_FULL_SYNC_START);
          syncIntentFilter.addAction(FileSyncAdapter.EVENT_FULL_SYNC_END);
          syncIntentFilter.addAction(FileSyncAdapter.EVENT_FULL_SYNC_FOLDER_CONTENTS_SYNCED);
 -        syncIntentFilter.addAction(SynchronizeFolderOperation.EVENT_SINGLE_FOLDER_CONTENTS_SYNCED);
 -        syncIntentFilter.addAction(SynchronizeFolderOperation.EVENT_SINGLE_FOLDER_SHARES_SYNCED);
 +        syncIntentFilter.addAction(RefreshFolderOperation.EVENT_SINGLE_FOLDER_CONTENTS_SYNCED);
 +        syncIntentFilter.addAction(RefreshFolderOperation.EVENT_SINGLE_FOLDER_SHARES_SYNCED);
          mSyncBroadcastReceiver = new SyncBroadcastReceiver();
          registerReceiver(mSyncBroadcastReceiver, syncIntentFilter);
 -        //LocalBroadcastManager.getInstance(this).registerReceiver(mSyncBroadcastReceiver, syncIntentFilter);
 +        //LocalBroadcastManager.getInstance(this).registerReceiver(mSyncBroadcastReceiver,
 +        // syncIntentFilter);
  
          // Listen for upload messages
          IntentFilter uploadIntentFilter = new IntentFilter(FileUploader.getUploadFinishMessage());
@@@ -792,19 -814,18 +800,19 @@@
          registerReceiver(mUploadFinishReceiver, uploadIntentFilter);
  
          // Listen for download messages
 -        IntentFilter downloadIntentFilter = new IntentFilter(FileDownloader.getDownloadAddedMessage());
 +        IntentFilter downloadIntentFilter = new IntentFilter(
 +                FileDownloader.getDownloadAddedMessage());
          downloadIntentFilter.addAction(FileDownloader.getDownloadFinishMessage());
          mDownloadFinishReceiver = new DownloadFinishReceiver();
          registerReceiver(mDownloadFinishReceiver, downloadIntentFilter);
-         
 +        Log_OC.v(TAG, "onResume() end");
+ 
 -        Log_OC.d(TAG, "onResume() end");
      }
  
  
      @Override
      protected void onPause() {
 -        Log_OC.e(TAG, "onPause() start");
 +        Log_OC.v(TAG, "onPause() start");
          if (mSyncBroadcastReceiver != null) {
              unregisterReceiver(mSyncBroadcastReceiver);
              //LocalBroadcastManager.getInstance(this).unregisterReceiver(mSyncBroadcastReceiver);
@@@ -818,12 -839,211 +826,12 @@@
              unregisterReceiver(mDownloadFinishReceiver);
              mDownloadFinishReceiver = null;
          }
-         
+ 
 -
 -        Log_OC.d(TAG, "onPause() end");
          super.onPause();
 +        Log_OC.v(TAG, "onPause() end");
      }
  
  
 -    @Override
 -    protected Dialog onCreateDialog(int id) {
 -        Dialog dialog = null;
 -        AlertDialog.Builder builder;
 -        switch (id) {
 -            case DIALOG_SHORT_WAIT: {
 -                ProgressDialog working_dialog = new ProgressDialog(this);
 -                working_dialog.setMessage(getResources().getString(
 -                        R.string.wait_a_moment));
 -                working_dialog.setIndeterminate(true);
 -                working_dialog.setCancelable(false);
 -                dialog = working_dialog;
 -                break;
 -            }
 -            case DIALOG_CHOOSE_UPLOAD_SOURCE: {
 -
 -
 -                String[] allTheItems = {getString(R.string.actionbar_upload_files),
 -                        getString(R.string.actionbar_upload_from_apps)};
 -
 -                builder = new AlertDialog.Builder(this);
 -                builder.setTitle(R.string.actionbar_upload);
 -                builder.setItems(allTheItems, new DialogInterface.OnClickListener() {
 -                    public void onClick(DialogInterface dialog, int item) {
 -                        if (item == 0) {
 -                            // if (!mDualPane) {
 -                            Intent action = new Intent(FileDisplayActivity.this, UploadFilesActivity.class);
 -                            action.putExtra(UploadFilesActivity.EXTRA_ACCOUNT, FileDisplayActivity.this.getAccount());
 -                            startActivityForResult(action, ACTION_SELECT_MULTIPLE_FILES);
 -                            // } else {
 -                            // TODO create and handle new fragment
 -                            // LocalFileListFragment
 -                            // }
 -                        } else if (item == 1) {
 -                            Intent action = new Intent(Intent.ACTION_GET_CONTENT);
 -                            action = action.setType("*/*").addCategory(Intent.CATEGORY_OPENABLE);
 -                            startActivityForResult(Intent.createChooser(action, getString(R.string.upload_chooser_title)),
 -                                    ACTION_SELECT_CONTENT_FROM_APPS);
 -                        }
 -                    }
 -                });
 -                dialog = builder.create();
 -                break;
 -            }
 -            case DIALOG_CERT_NOT_SAVED: {
 -                builder = new AlertDialog.Builder(this);
 -                builder.setMessage(getResources().getString(R.string.ssl_validator_not_saved));
 -                builder.setCancelable(false);
 -                builder.setPositiveButton(R.string.common_ok, new DialogInterface.OnClickListener() {
 -                    @Override
 -                    public void onClick(DialogInterface dialog, int which) {
 -                        dialog.dismiss();
 -                    }
 -
 -                    ;
 -                });
 -                dialog = builder.create();
 -                break;
 -            }
 -            default:
 -                dialog = null;
 -        }
 -
 -        return dialog;
 -    }
 -
 -    /**
 -     * Translates a content URI of an image to a physical path
 -     * on the disk
 -     *
 -     * @param uri The URI to resolve
 -     * @return The path to the content or null if it could not be found
 -     */
 -    public String getPath(Uri uri) {
 -        final boolean isKitKatOrLater = Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT;
 -
 -        // DocumentProvider
 -        if (isKitKatOrLater && DocumentsContract.isDocumentUri(getApplicationContext(), uri)) {
 -            // ExternalStorageProvider
 -            if (UriUtils.isExternalStorageDocument(uri)) {
 -                final String docId = DocumentsContract.getDocumentId(uri);
 -                final String[] split = docId.split(":");
 -                final String type = split[0];
 -
 -                if ("primary".equalsIgnoreCase(type)) {
 -                    return Environment.getExternalStorageDirectory() + "/" + split[1];
 -                }
 -            }
 -            // DownloadsProvider
 -            else if (UriUtils.isDownloadsDocument(uri)) {
 -
 -                final String id = DocumentsContract.getDocumentId(uri);
 -                final Uri contentUri = ContentUris.withAppendedId(Uri.parse("content://downloads/public_downloads"),
 -                        Long.valueOf(id));
 -
 -                return UriUtils.getDataColumn(getApplicationContext(), contentUri, null, null);
 -            }
 -            // MediaProvider
 -            else if (UriUtils.isMediaDocument(uri)) {
 -                final String docId = DocumentsContract.getDocumentId(uri);
 -                final String[] split = docId.split(":");
 -                final String type = split[0];
 -
 -                Uri contentUri = null;
 -                if ("image".equals(type)) {
 -                    contentUri = MediaStore.Images.Media.EXTERNAL_CONTENT_URI;
 -                } else if ("video".equals(type)) {
 -                    contentUri = MediaStore.Video.Media.EXTERNAL_CONTENT_URI;
 -                } else if ("audio".equals(type)) {
 -                    contentUri = MediaStore.Audio.Media.EXTERNAL_CONTENT_URI;
 -                }
 -
 -                final String selection = "_id=?";
 -                final String[] selectionArgs = new String[]{split[1]};
 -
 -                return UriUtils.getDataColumn(getApplicationContext(), contentUri, selection, selectionArgs);
 -            }
 -            // Documents providers returned as content://...
 -            else if (UriUtils.isContentDocument(uri)) {
 -                return uri.toString();
 -            }
 -        }
 -        // MediaStore (and general)
 -        else if ("content".equalsIgnoreCase(uri.getScheme())) {
 -
 -            // Return the remote address
 -            if (UriUtils.isGooglePhotosUri(uri))
 -                return uri.getLastPathSegment();
 -
 -            return UriUtils.getDataColumn(getApplicationContext(), uri, null, null);
 -        }
 -        // File
 -        else if ("file".equalsIgnoreCase(uri.getScheme())) {
 -            return uri.getPath();
 -        }
 -        return null;
 -    }
 -
 -    /**
 -     * Pushes a directory to the drop down list
 -     *
 -     * @param directory to push
 -     * @throws IllegalArgumentException If the {@link OCFile#isFolder()} returns false.
 -     */
 -    public void pushDirname(OCFile directory) {
 -        if (!directory.isFolder()) {
 -            throw new IllegalArgumentException("Only directories may be pushed!");
 -        }
 -        mDirectories.insert(directory.getFileName(), 0);
 -        setFile(directory);
 -    }
 -
 -    /**
 -     * Pops a directory name from the drop down list
 -     *
 -     * @return True, unless the stack is empty
 -     */
 -    public boolean popDirname() {
 -        mDirectories.remove(mDirectories.getItem(0));
 -        return !mDirectories.isEmpty();
 -    }
 -
 -    // Custom array adapter to override text colors
 -    private class CustomArrayAdapter<T> extends ArrayAdapter<T> {
 -
 -        public CustomArrayAdapter(FileDisplayActivity ctx, int view) {
 -            super(ctx, view);
 -        }
 -
 -        public View getView(int position, View convertView, ViewGroup parent) {
 -            View v = super.getView(position, convertView, parent);
 -
 -            ((TextView) v).setTextColor(getResources().getColorStateList(
 -                    android.R.color.white));
 -
 -            fixRoot((TextView) v);
 -            return v;
 -        }
 -
 -        public View getDropDownView(int position, View convertView,
 -                                    ViewGroup parent) {
 -            View v = super.getDropDownView(position, convertView, parent);
 -
 -            ((TextView) v).setTextColor(getResources().getColorStateList(
 -                    android.R.color.white));
 -
 -            fixRoot((TextView) v);
 -            return v;
 -        }
 -
 -        private void fixRoot(TextView v) {
 -            if (v.getText().equals(OCFile.PATH_SEPARATOR)) {
 -                v.setText(R.string.default_display_name_for_root_folder);
 -            }
 -        }
 -
 -    }
 -
      private class SyncBroadcastReceiver extends BroadcastReceiver {
  
          /**
@@@ -835,112 -1055,100 +843,111 @@@
                  String event = intent.getAction();
                  Log_OC.d(TAG, "Received broadcast " + event);
                  String accountName = intent.getStringExtra(FileSyncAdapter.EXTRA_ACCOUNT_NAME);
 -                String synchFolderRemotePath = intent.getStringExtra(FileSyncAdapter.EXTRA_FOLDER_PATH);
 -                RemoteOperationResult synchResult = (RemoteOperationResult) intent.getSerializableExtra(FileSyncAdapter.EXTRA_RESULT);
 -                boolean sameAccount = (getAccount() != null && accountName.equals(getAccount().name) && getStorageManager() != null);
 +                String synchFolderRemotePath =
 +                        intent.getStringExtra(FileSyncAdapter.EXTRA_FOLDER_PATH);
 +                RemoteOperationResult synchResult =
 +                        (RemoteOperationResult)intent.getSerializableExtra(
 +                                FileSyncAdapter.EXTRA_RESULT);
 +                boolean sameAccount = (getAccount() != null &&
 +                        accountName.equals(getAccount().name) && getStorageManager() != null);
-     
+ 
                  if (sameAccount) {
-                     
+ 
                      if (FileSyncAdapter.EVENT_FULL_SYNC_START.equals(event)) {
                          mSyncInProgress = true;
-                         
+ 
                      } else {
 -                        OCFile currentFile = (getFile() == null) ? null : getStorageManager().getFileByPath(getFile().getRemotePath());
 -                        OCFile currentDir = (getCurrentDir() == null) ? null : getStorageManager().getFileByPath(getCurrentDir().getRemotePath());
 -
 +                        OCFile currentFile = (getFile() == null) ? null :
 +                                getStorageManager().getFileByPath(getFile().getRemotePath());
 +                        OCFile currentDir = (getCurrentDir() == null) ? null :
 +                                getStorageManager().getFileByPath(getCurrentDir().getRemotePath());
 +    
                          if (currentDir == null) {
                              // current folder was removed from the server 
 -                            Toast.makeText(FileDisplayActivity.this,
 -                                    String.format(getString(R.string.sync_current_folder_was_removed), mDirectories.getItem(0)),
 -                                    Toast.LENGTH_LONG)
 -                                    .show();
 +                            Toast.makeText( FileDisplayActivity.this, 
 +                                            String.format(
 +                                                    getString(R.string.
 +                                                            sync_current_folder_was_removed),
 +                                                   synchFolderRemotePath),
 +                                            Toast.LENGTH_LONG)
 +                                .show();
++
                              browseToRoot();
-                             
+ 
                          } else {
                              if (currentFile == null && !getFile().isFolder()) {
 -                                // currently selected file was removed in the server, and now we know it
 +                                // currently selected file was removed in the server, and now we
 +                                // know it
                                  cleanSecondFragment();
                                  currentFile = currentDir;
                              }
  
 -                            if (synchFolderRemotePath != null && currentDir.getRemotePath().equals(synchFolderRemotePath)) {
 +                            if (synchFolderRemotePath != null &&
 +                                    currentDir.getRemotePath().equals(synchFolderRemotePath)) {
                                  OCFileListFragment fileListFragment = getListOfFilesFragment();
                                  if (fileListFragment != null) {
 -                                    fileListFragment.listDirectory(currentDir);
 +                                    fileListFragment.listDirectory();
 +                                    // TODO Enable when "On Device" is recovered ?
 +                                    // fileListFragment.listDirectory(currentDir,
 +                                    // MainApp.getOnlyOnDevice());
                                  }
                              }
                              setFile(currentFile);
                          }
-                         
+ 
 -                        mSyncInProgress = (!FileSyncAdapter.EVENT_FULL_SYNC_END.equals(event) && !SynchronizeFolderOperation.EVENT_SINGLE_FOLDER_SHARES_SYNCED.equals(event));
 -
 -                        if (SynchronizeFolderOperation.EVENT_SINGLE_FOLDER_CONTENTS_SYNCED.
 -                                equals(event) &&
 -                                /// TODO refactor and make common
 +                        mSyncInProgress = (!FileSyncAdapter.EVENT_FULL_SYNC_END.equals(event) &&
 +                                !RefreshFolderOperation.EVENT_SINGLE_FOLDER_SHARES_SYNCED
 +                                        .equals(event));
 +                                
 +                        if (RefreshFolderOperation.EVENT_SINGLE_FOLDER_CONTENTS_SYNCED.
-                                     equals(event) &&
-                                 /// TODO refactor and make common
-                                 synchResult != null && !synchResult.isSuccess() &&  
-                                 (synchResult.getCode() == ResultCode.UNAUTHORIZED   || 
-                                     synchResult.isIdPRedirection()                  ||
-                                     (synchResult.isException() && synchResult.getException() 
-                                             instanceof AuthenticatorException))) {
++                                    equals(event) &&/// TODO refactor and make common
+                                 synchResult != null && !synchResult.isSuccess() &&
+                                 (synchResult.getCode() == ResultCode.UNAUTHORIZED ||
+                                         synchResult.isIdPRedirection() ||
+                                         (synchResult.isException() && synchResult.getException()
+                                                 instanceof AuthenticatorException))) {
  
 -                            OwnCloudClient client = null;
 +
                              try {
 +                                OwnCloudClient client;
                                  OwnCloudAccount ocAccount =
                                          new OwnCloudAccount(getAccount(), context);
                                  client = (OwnCloudClientManagerFactory.getDefaultSingleton().
                                          removeClientFor(ocAccount));
 -                                // TODO get rid of these exceptions
 -                            } catch (AccountNotFoundException e) {
 -                                e.printStackTrace();
 -                            } catch (AuthenticatorException e) {
 -                                e.printStackTrace();
 -                            } catch (OperationCanceledException e) {
 -                                e.printStackTrace();
 -                            } catch (IOException e) {
 -                                e.printStackTrace();
 -                            }
--
 -                            if (client != null) {
 -                                OwnCloudCredentials cred = client.getCredentials();
 -                                if (cred != null) {
 -                                    AccountManager am = AccountManager.get(context);
 -                                    if (cred.authTokenExpires()) {
 -                                        am.invalidateAuthToken(
 -                                                getAccount().type,
 -                                                cred.getAuthToken()
 -                                        );
 -                                    } else {
 -                                        am.clearPassword(getAccount());
 +                                if (client != null) {
 +                                    OwnCloudCredentials cred = client.getCredentials();
 +                                    if (cred != null) {
 +                                        AccountManager am = AccountManager.get(context);
 +                                        if (cred.authTokenExpires()) {
 +                                            am.invalidateAuthToken(
 +                                                    getAccount().type,
 +                                                    cred.getAuthToken()
 +                                            );
 +                                        } else {
 +                                            am.clearPassword(getAccount());
 +                                        }
                                      }
                                  }
 -                            }
 +                                requestCredentialsUpdate();
  
 -                            requestCredentialsUpdate();
 +                            } catch (AccountNotFoundException e) {
 +                                Log_OC.e(TAG, "Account " + getAccount() + " was removed!", e);
 +                            }
  
                          }
                      }
                      removeStickyBroadcast(intent);
                      Log_OC.d(TAG, "Setting progress visibility to " + mSyncInProgress);
 -                    setSupportProgressBarIndeterminateVisibility(mSyncInProgress /*|| mRefreshSharesInProgress*/);
 +                    setSupportProgressBarIndeterminateVisibility(mSyncInProgress
 +                    /*|| mRefreshSharesInProgress*/);
  
                      setBackgroundText();
-                         
+ 
                  }
-                 
+ 
                  if (synchResult != null) {
 -                    if (synchResult.getCode().equals(RemoteOperationResult.ResultCode.SSL_RECOVERABLE_PEER_UNVERIFIED)) {
 +                    if (synchResult.getCode().equals(
 +                            RemoteOperationResult.ResultCode.SSL_RECOVERABLE_PEER_UNVERIFIED)) {
                          mLastSslUntrustedServerResult = synchResult;
                      }
                  }
@@@ -951,7 -1159,7 +958,7 @@@
              }
          }
      }
-     
+ 
      /**
       * Show a text message on screen view for notifying user if content is
       * loading or folder is empty
@@@ -976,7 -1184,8 +983,8 @@@
      private class UploadFinishReceiver extends BroadcastReceiver {
          /**
           * Once the file upload has finished -> update view
-          *  @author David A. Velasco
+          *
+          * @author David A. Velasco
           * {@link BroadcastReceiver} to enable upload feedback in UI
           */
          @Override
@@@ -986,23 -1195,22 +994,22 @@@
                  String accountName = intent.getStringExtra(FileUploader.ACCOUNT_NAME);
                  boolean sameAccount = getAccount() != null && accountName.equals(getAccount().name);
                  OCFile currentDir = getCurrentDir();
-                 boolean isDescendant = (currentDir != null) && (uploadedRemotePath != null) && 
+                 boolean isDescendant = (currentDir != null) && (uploadedRemotePath != null) &&
                          (uploadedRemotePath.startsWith(currentDir.getRemotePath()));
-                 
+ 
                  if (sameAccount && isDescendant) {
                      refreshListOfFilesFragment();
                  }
-                 
 -
 -                boolean uploadWasFine = intent.getBooleanExtra(FileUploader.EXTRA_UPLOAD_RESULT, false);
 +                boolean uploadWasFine = intent.getBooleanExtra(FileUploader.EXTRA_UPLOAD_RESULT,
 +                        false);
                  boolean renamedInUpload = getFile().getRemotePath().
                          equals(intent.getStringExtra(FileUploader.EXTRA_OLD_REMOTE_PATH));
-                 boolean sameFile = getFile().getRemotePath().equals(uploadedRemotePath) || 
+                 boolean sameFile = getFile().getRemotePath().equals(uploadedRemotePath) ||
                          renamedInUpload;
                  FileFragment details = getSecondFragment();
-                 boolean detailFragmentIsShown = (details != null && 
+                 boolean detailFragmentIsShown = (details != null &&
                          details instanceof FileDetailFragment);
-                 
+ 
                  if (sameAccount && sameFile && detailFragmentIsShown) {
                      if (uploadWasFine) {
                          setFile(getStorageManager().getFileByPath(uploadedRemotePath));
@@@ -1010,75 -1218,67 +1017,80 @@@
                      if (renamedInUpload) {
                          String newName = (new File(uploadedRemotePath)).getName();
                          Toast msg = Toast.makeText(
-                                 context, 
+                                 context,
                                  String.format(
-                                         getString(R.string.filedetails_renamed_in_upload_msg), 
-                                         newName), 
+                                         getString(R.string.filedetails_renamed_in_upload_msg),
+                                         newName),
                                  Toast.LENGTH_LONG);
                          msg.show();
                      }
                      if (uploadWasFine || getFile().fileExists()) {
-                         ((FileDetailFragment)details).updateFileDetails(false, true);
+                         ((FileDetailFragment) details).updateFileDetails(false, true);
                      } else {
                          cleanSecondFragment();
                      }
-                     
-                     // Force the preview if the file is an image
-                     if (uploadWasFine && PreviewImageFragment.canBePreviewed(getFile())) {
-                         startImagePreview(getFile());
-                     } // TODO what about other kind of previews?
+ 
+                     // Force the preview if the file is an image or text file
+                     if (uploadWasFine) {
+                         OCFile ocFile = getFile();
+                         if (PreviewImageFragment.canBePreviewed(ocFile))
+                             startImagePreview(getFile());
+                         else if (PreviewTextFragment.canBePreviewed(ocFile))
+                             startTextPreview(ocFile);
+                         // TODO what about other kind of previews?
+                     }
                  }
-                 
+ 
              } finally {
                  if (intent != null) {
                      removeStickyBroadcast(intent);
                  }
              }
-             
+ 
          }
-         
+ 
      }
  
  
      /**
       * Class waiting for broadcast events from the {@link FileDownloader} service.
-      * 
 -     * <p/>
++     *
       * Updates the UI when a download is started or finished, provided that it is relevant for the
       * current folder.
       */
      private class DownloadFinishReceiver extends BroadcastReceiver {
 +
 +        //int refreshCounter = 0;
          @Override
          public void onReceive(Context context, Intent intent) {
              try {
                  boolean sameAccount = isSameAccount(context, intent);
 -                String downloadedRemotePath = intent.getStringExtra(FileDownloader.EXTRA_REMOTE_PATH);
 +                String downloadedRemotePath =
 +                        intent.getStringExtra(FileDownloader.EXTRA_REMOTE_PATH);
                  boolean isDescendant = isDescendant(downloadedRemotePath);
  
                  if (sameAccount && isDescendant) {
 -                    refreshListOfFilesFragment();
 -                    refreshSecondFragment(intent.getAction(), downloadedRemotePath, intent.getBooleanExtra(FileDownloader.EXTRA_DOWNLOAD_RESULT, false));
 +                    String linkedToRemotePath =
 +                            intent.getStringExtra(FileDownloader.EXTRA_LINKED_TO_PATH);
 +                    if (linkedToRemotePath == null || isAscendant(linkedToRemotePath)) {
 +                        //Log_OC.v(TAG, "refresh #" + ++refreshCounter);
 +                        refreshListOfFilesFragment();
 +                    }
 +                    refreshSecondFragment(
 +                            intent.getAction(),
 +                            downloadedRemotePath,
 +                            intent.getBooleanExtra(FileDownloader.EXTRA_DOWNLOAD_RESULT, false)
 +                    );
                  }
-     
+ 
                  if (mWaitingToSend != null) {
 -                    mWaitingToSend = getStorageManager().getFileByPath(mWaitingToSend.getRemotePath()); // Update the file to send
 +                    mWaitingToSend =
 +                            getStorageManager().getFileByPath(mWaitingToSend.getRemotePath());
-                     if (mWaitingToSend.isDown()) { 
+                     if (mWaitingToSend.isDown()) {
                          sendDownloadedFile();
                      }
                  }
-             
+ 
              } finally {
                  if (intent != null) {
                      removeStickyBroadcast(intent);
@@@ -1088,82 -1288,102 +1100,81 @@@
  
          private boolean isDescendant(String downloadedRemotePath) {
              OCFile currentDir = getCurrentDir();
 -            return (currentDir != null && downloadedRemotePath != null && downloadedRemotePath.startsWith(currentDir.getRemotePath()));
 +            return (
 +                currentDir != null &&
 +                downloadedRemotePath != null &&
 +                downloadedRemotePath.startsWith(currentDir.getRemotePath())
 +            );
 +        }
 +
 +        private boolean isAscendant(String linkedToRemotePath) {
 +            OCFile currentDir = getCurrentDir();
 +            return (
 +                currentDir != null &&
 +                currentDir.getRemotePath().startsWith(linkedToRemotePath)
 +            );
          }
  
          private boolean isSameAccount(Context context, Intent intent) {
              String accountName = intent.getStringExtra(FileDownloader.ACCOUNT_NAME);
 -            return (accountName != null && getAccount() != null && accountName.equals(getAccount().name));
 +            return (accountName != null && getAccount() != null &&
 +                    accountName.equals(getAccount().name));
          }
      }
-     
-     
+ 
+ 
      public void browseToRoot() {
-         OCFileListFragment listOfFiles = getListOfFilesFragment(); 
+         OCFileListFragment listOfFiles = getListOfFilesFragment();
          if (listOfFiles != null) {  // should never be null, indeed
 -            while (mDirectories.getCount() > 1) {
 -                popDirname();
 -            }
              OCFile root = getStorageManager().getFileByPath(OCFile.ROOT_PATH);
              listOfFiles.listDirectory(root);
 +            // TODO Enable when "On Device" is recovered ?
 +            // listOfFiles.listDirectory(root, MainApp.getOnlyOnDevice());
              setFile(listOfFiles.getCurrentFile());
              startSyncFolderOperation(root, false);
          }
          cleanSecondFragment();
- 
      }
  
  
 -    public void browseTo(OCFile folder) {
 -        if (folder == null || !folder.isFolder()) {
 -            throw new IllegalArgumentException("Trying to browse to invalid folder " + folder);
 -        }
 -        OCFileListFragment listOfFiles = getListOfFilesFragment();
 -        if (listOfFiles != null) {
 -            setNavigationListWithFolder(folder);
 -            listOfFiles.listDirectory(folder);
 -            setFile(listOfFiles.getCurrentFile());
 -            startSyncFolderOperation(folder, false);
 -        } else {
 -            Log_OC.e(TAG, "Unexpected null when accessing list fragment");
 -        }
 -        cleanSecondFragment();
 -    }
 -
 -
      /**
       * {@inheritDoc}
-      * 
+      * <p/>
       * Updates action bar and second fragment, if in dual pane mode.
       */
      @Override
      public void onBrowsedDownTo(OCFile directory) {
 -        pushDirname(directory);
 +        setFile(directory);
          cleanSecondFragment();
 -
          // Sync Folder
          startSyncFolderOperation(directory, false);
 -
      }
  
      /**
-      * Shows the information of the {@link OCFile} received as a 
+      * Shows the information of the {@link OCFile} received as a
       * parameter in the second fragment.
-      * 
-      * @param file          {@link OCFile} whose details will be shown
+      *
+      * @param file {@link OCFile} whose details will be shown
       */
      @Override
      public void showDetails(OCFile file) {
 -        Fragment detailFragment = new FileDetailFragment(file, getAccount());
 +        Fragment detailFragment = FileDetailFragment.newInstance(file, getAccount());
          setSecondFragment(detailFragment);
          updateFragmentsVisibility(true);
 -        updateNavigationElementsInActionBar(file);
 +        updateActionBarTitleAndHomeButton(file);
          setFile(file);
      }
  
 -
 -    /**
 -     * TODO
 -     */
 -    private void updateNavigationElementsInActionBar(OCFile chosenFile) {
 -        ActionBar actionBar = getSupportActionBar();
 -        if (chosenFile == null || mDualPane) {
 -            // only list of files - set for browsing through folders
 -            OCFile currentDir = getCurrentDir();
 -            boolean noRoot = (currentDir != null && currentDir.getParentId() != 0);
 -            actionBar.setDisplayHomeAsUpEnabled(noRoot);
 -            actionBar.setDisplayShowTitleEnabled(!noRoot);
 -            if (!noRoot) {
 -                actionBar.setTitle(getString(R.string.default_display_name_for_root_folder));
 -            }
 -            actionBar.setNavigationMode(!noRoot ? ActionBar.NAVIGATION_MODE_STANDARD : ActionBar.NAVIGATION_MODE_LIST);
 -            actionBar.setListNavigationCallbacks(mDirectories, this);   // assuming mDirectories is updated
 +    @Override
 +    protected void updateActionBarTitleAndHomeButton(OCFile chosenFile) {
 +        if (mDualPane) {
 +            // in dual pane mode, keep the focus of title an action bar in the current folder
 +            super.updateActionBarTitleAndHomeButton(getCurrentDir());
  
          } else {
 -            actionBar.setDisplayHomeAsUpEnabled(true);
 -            actionBar.setDisplayShowTitleEnabled(true);
 -            actionBar.setTitle(chosenFile.getFileName());
 -            actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_STANDARD);
 +            super.updateActionBarTitleAndHomeButton(chosenFile);
          }
 +
      }
  
  
@@@ -1172,43 -1392,38 +1183,45 @@@
          return new ListServiceConnection();
      }
  
-     /** Defines callbacks for service binding, passed to bindService() */
+     /**
+      * Defines callbacks for service binding, passed to bindService()
+      */
      private class ListServiceConnection implements ServiceConnection {
  
          @Override
          public void onServiceConnected(ComponentName component, IBinder service) {
 -            if (component.equals(new ComponentName(FileDisplayActivity.this, FileDownloader.class))) {
 +            if (component.equals(new ComponentName(
 +                    FileDisplayActivity.this, FileDownloader.class))) {
                  Log_OC.d(TAG, "Download service connected");
                  mDownloaderBinder = (FileDownloaderBinder) service;
                  if (mWaitingToPreview != null)
                      if (getStorageManager() != null) {
 -                        mWaitingToPreview = getStorageManager().getFileById(mWaitingToPreview.getFileId()); // update the file
 +                         // update the file
 +                        mWaitingToPreview =
 +                                getStorageManager().getFileById(mWaitingToPreview.getFileId());
                          if (!mWaitingToPreview.isDown()) {
                              requestForDownload();
                          }
-                 }
+                     }
  
 -            } else if (component.equals(new ComponentName(FileDisplayActivity.this, FileUploader.class))) {
 +            } else if (component.equals(new ComponentName(FileDisplayActivity.this,
 +                    FileUploader.class))) {
                  Log_OC.d(TAG, "Upload service connected");
                  mUploaderBinder = (FileUploaderBinder) service;
              } else {
                  return;
              }
 -            // a new chance to get the mDownloadBinder through getFileDownloadBinder() - THIS IS A MESS
 +            // a new chance to get the mDownloadBinder through
 +            // getFileDownloadBinder() - THIS IS A MESS
-             OCFileListFragment listOfFiles = getListOfFilesFragment(); 
+             OCFileListFragment listOfFiles = getListOfFilesFragment();
              if (listOfFiles != null) {
                  listOfFiles.listDirectory();
 +                // TODO Enable when "On Device" is recovered ?
 +                // listOfFiles.listDirectory(MainApp.getOnlyOnDevice());
              }
              FileFragment secondFragment = getSecondFragment();
              if (secondFragment != null && secondFragment instanceof FileDetailFragment) {
-                 FileDetailFragment detailFragment = (FileDetailFragment)secondFragment;
+                 FileDetailFragment detailFragment = (FileDetailFragment) secondFragment;
                  detailFragment.listenForTransferProgress();
                  detailFragment.updateFileDetails(false, false);
              }
@@@ -1216,18 -1431,34 +1229,18 @@@
  
          @Override
          public void onServiceDisconnected(ComponentName component) {
 -            if (component.equals(new ComponentName(FileDisplayActivity.this, FileDownloader.class))) {
 +            if (component.equals(new ComponentName(FileDisplayActivity.this,
 +                    FileDownloader.class))) {
                  Log_OC.d(TAG, "Download service disconnected");
                  mDownloaderBinder = null;
 -            } else if (component.equals(new ComponentName(FileDisplayActivity.this, FileUploader.class))) {
 +            } else if (component.equals(new ComponentName(FileDisplayActivity.this,
 +                    FileUploader.class))) {
                  Log_OC.d(TAG, "Upload service disconnected");
                  mUploaderBinder = null;
              }
          }
-     };    
+     }
  
 -    ;
 -
 -
 -    /**
 -     * Launch an intent to request the PIN code to the user before letting him use the app
 -     */
 -    private void requestPinCode() {
 -        boolean pinStart = false;
 -        SharedPreferences appPrefs = PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
 -        pinStart = appPrefs.getBoolean("set_pincode", false);
 -        if (pinStart) {
 -            Intent i = new Intent(getApplicationContext(), PinCodeActivity.class);
 -            i.putExtra(PinCodeActivity.EXTRA_ACTIVITY, "FileDisplayActivity");
 -            startActivity(i);
 -        }
 -    }
 -
 -
      @Override
      public void onSavedCertificate() {
          startSyncFolderOperation(getCurrentDir(), false);
@@@ -1236,10 -1467,7 +1249,10 @@@
  
      @Override
      public void onFailedSavingCertificate() {
 -        showDialog(DIALOG_CERT_NOT_SAVED);
 +        ConfirmationDialogFragment dialog = ConfirmationDialogFragment.newInstance(
 +                R.string.ssl_validator_not_saved, new String[]{}, R.string.common_ok, -1, -1
 +        );
 +        dialog.show(getSupportFragmentManager(), DIALOG_CERT_NOT_SAVED);
      }
  
      @Override
@@@ -1250,104 -1478,102 +1263,103 @@@
      /**
       * Updates the view associated to the activity after the finish of some operation over files
       * in the current account.
-      * 
-      * @param operation     Removal operation performed.
-      * @param result        Result of the removal.
+      *
+      * @param operation Removal operation performed.
+      * @param result    Result of the removal.
       */
      @Override
      public void onRemoteOperationFinish(RemoteOperation operation, RemoteOperationResult result) {
          super.onRemoteOperationFinish(operation, result);
-         
+ 
          if (operation instanceof RemoveFileOperation) {
              onRemoveFileOperationFinish((RemoveFileOperation) operation, result);
  
          } else if (operation instanceof RenameFileOperation) {
-             onRenameFileOperationFinish((RenameFileOperation)operation, result);
+             onRenameFileOperationFinish((RenameFileOperation) operation, result);
  
          } else if (operation instanceof SynchronizeFileOperation) {
-             onSynchronizeFileOperationFinish((SynchronizeFileOperation)operation, result);
+             onSynchronizeFileOperationFinish((SynchronizeFileOperation) operation, result);
  
          } else if (operation instanceof CreateFolderOperation) {
-             onCreateFolderOperationFinish((CreateFolderOperation)operation, result);
-             
+             onCreateFolderOperationFinish((CreateFolderOperation) operation, result);
+ 
          } else if (operation instanceof CreateShareOperation) {
              onCreateShareOperationFinish((CreateShareOperation) operation, result);
-             
+ 
          } else if (operation instanceof UnshareLinkOperation) {
-             onUnshareLinkOperationFinish((UnshareLinkOperation)operation, result);
-         
+             onUnshareLinkOperationFinish((UnshareLinkOperation) operation, result);
+ 
          } else if (operation instanceof MoveFileOperation) {
-             onMoveFileOperationFinish((MoveFileOperation)operation, result);
+             onMoveFileOperationFinish((MoveFileOperation) operation, result);
          }
-         
-     }
  
+     }
 -
 -
 -    private void onCreateShareOperationFinish(CreateShareOperation operation, RemoteOperationResult result) {
 +    
 +    private void onCreateShareOperationFinish(CreateShareOperation operation,
 +                                              RemoteOperationResult result) {
          if (result.isSuccess()) {
              refreshShowDetails();
              refreshListOfFilesFragment();
          }
      }
  
-     
 -
 -    private void onUnshareLinkOperationFinish(UnshareLinkOperation operation, RemoteOperationResult result) {
 +    private void onUnshareLinkOperationFinish(UnshareLinkOperation operation,
 +                                              RemoteOperationResult result) {
          if (result.isSuccess()) {
              refreshShowDetails();
              refreshListOfFilesFragment();
-             
+ 
          } else if (result.getCode() == ResultCode.SHARE_NOT_FOUND) {
              cleanSecondFragment();
              refreshListOfFilesFragment();
          }
      }
-     
+ 
      private void refreshShowDetails() {
          FileFragment details = getSecondFragment();
          if (details != null) {
              OCFile file = details.getFile();
              if (file != null) {
-                 file = getStorageManager().getFileByPath(file.getRemotePath()); 
+                 file = getStorageManager().getFileByPath(file.getRemotePath());
                  if (details instanceof PreviewMediaFragment) {
                      // Refresh  OCFile of the fragment
                      ((PreviewMediaFragment) details).updateFile(file);
-                 } else {
+                 } else if (details instanceof PreviewTextFragment) {
+                     // Refresh  OCFile of the fragment
+                     ((PreviewTextFragment) details).updateFile(file);
+                 } else
                      showDetails(file);
-                 } 
              }
              invalidateOptionsMenu();
-         } 
+         }
      }
-     
+ 
      /**
 -     * Updates the view associated to the activity after the finish of an operation trying to remove a
 -     * file.
 -     *
 -     * @param operation Removal operation performed.
 -     * @param result    Result of the removal.
 +     * Updates the view associated to the activity after the finish of an operation trying to
 +     * remove a file.
 +     * 
 +     * @param operation     Removal operation performed.
 +     * @param result        Result of the removal.
       */
 -    private void onRemoveFileOperationFinish(RemoveFileOperation operation, RemoteOperationResult result) {
 +    private void onRemoveFileOperationFinish(RemoveFileOperation operation,
 +                                             RemoteOperationResult result) {
          dismissLoadingDialog();
-         
 -
 -        Toast msg = Toast.makeText(this, ErrorMessageAdapter.getErrorCauseMessage(result, operation, getResources()),
 +        Toast msg = Toast.makeText(this,
 +                ErrorMessageAdapter.getErrorCauseMessage(result, operation, getResources()),
-                 Toast.LENGTH_LONG); 
+                 Toast.LENGTH_LONG);
          msg.show();
-         
+ 
          if (result.isSuccess()) {
              OCFile removedFile = operation.getFile();
              FileFragment second = getSecondFragment();
              if (second != null && removedFile.equals(second.getFile())) {
                  if (second instanceof PreviewMediaFragment) {
-                     ((PreviewMediaFragment)second).stopPreview(true);
+                     ((PreviewMediaFragment) second).stopPreview(true);
                  }
                  setFile(getStorageManager().getFileById(removedFile.getParentId()));
                  cleanSecondFragment();
              }
--            if (getStorageManager().getFileById(removedFile.getParentId()).equals(getCurrentDir())) {
++            if (getStorageManager().getFileById(removedFile.getParentId()).equals(getCurrentDir())){
                  refreshListOfFilesFragment();
              }
              invalidateOptionsMenu();
@@@ -1358,76 -1584,78 +1370,84 @@@
              }
          }
      }
-     
-     
+ 
+ 
      /**
-      * Updates the view associated to the activity after the finish of an operation trying to move a 
+      * Updates the view associated to the activity after the finish of an operation trying to move a
       * file.
-      * 
-      * @param operation     Move operation performed.
-      * @param result        Result of the move operation.
+      *
+      * @param operation Move operation performed.
+      * @param result    Result of the move operation.
       */
 -    private void onMoveFileOperationFinish(MoveFileOperation operation, RemoteOperationResult result) {
 +    private void onMoveFileOperationFinish(MoveFileOperation operation,
 +                                           RemoteOperationResult result) {
          if (result.isSuccess()) {
              dismissLoadingDialog();
              refreshListOfFilesFragment();
          } else {
              dismissLoadingDialog();
              try {
-                 Toast msg = Toast.makeText(FileDisplayActivity.this, 
-                         ErrorMessageAdapter.getErrorCauseMessage(result, operation, getResources()), 
-                         Toast.LENGTH_LONG); 
+                 Toast msg = Toast.makeText(FileDisplayActivity.this,
+                         ErrorMessageAdapter.getErrorCauseMessage(result, operation, getResources()),
+                         Toast.LENGTH_LONG);
                  msg.show();
  
              } catch (NotFoundException e) {
-                 Log_OC.e(TAG, "Error while trying to show fail message " , e);
+                 Log_OC.e(TAG, "Error while trying to show fail message ", e);
              }
          }
      }
  
  
      /**
 -     * Updates the view associated to the activity after the finish of an operation trying to rename a
 -     * file.
 -     *
 -     * @param operation Renaming operation performed.
 -     * @param result    Result of the renaming.
 +     * Updates the view associated to the activity after the finish of an operation trying to rename
 +     * a file.
 +     * 
 +     * @param operation     Renaming operation performed.
 +     * @param result        Result of the renaming.
       */
 -    private void onRenameFileOperationFinish(RenameFileOperation operation, RemoteOperationResult result) {
 +    private void onRenameFileOperationFinish(RenameFileOperation operation,
 +                                             RemoteOperationResult result) {
          dismissLoadingDialog();
          OCFile renamedFile = operation.getFile();
          if (result.isSuccess()) {
              FileFragment details = getSecondFragment();
              if (details != null) {
 -                if (details instanceof FileDetailFragment && renamedFile.equals(details.getFile())) {
 +                if (details instanceof FileDetailFragment &&
 +                        renamedFile.equals(details.getFile()) ) {
                      ((FileDetailFragment) details).updateFileDetails(renamedFile, getAccount());
                      showDetails(renamedFile);
  
 -                } else if (details instanceof PreviewMediaFragment && renamedFile.equals(details.getFile())) {
 +                } else if (details instanceof PreviewMediaFragment &&
 +                        renamedFile.equals(details.getFile())) {
                      ((PreviewMediaFragment) details).updateFile(renamedFile);
                      if (PreviewMediaFragment.canBePreviewed(renamedFile)) {
-                         int position = ((PreviewMediaFragment)details).getPosition();
+                         int position = ((PreviewMediaFragment) details).getPosition();
                          startMediaPreview(renamedFile, position, true);
                      } else {
                          getFileOperationsHelper().openFile(renamedFile);
                      }
 -                } else if (details instanceof PreviewTextFragment && renamedFile.equals(details.getFile())) {
++                } else if (details instanceof PreviewTextFragment &&
++                        renamedFile.equals(details.getFile())) {
+                     ((PreviewTextFragment) details).updateFile(renamedFile);
+                     if (PreviewTextFragment.canBePreviewed(renamedFile)) {
+                         startTextPreview(renamedFile);
+                     } else {
+                         getFileOperationsHelper().openFile(renamedFile);
+                     }
                  }
              }
 -
 -            if (getStorageManager().getFileById(renamedFile.getParentId()).equals(getCurrentDir())) {
 +            
 +            if (getStorageManager().getFileById(renamedFile.getParentId()).equals(getCurrentDir())){
                  refreshListOfFilesFragment();
              }
  
          } else {
 -            Toast msg = Toast.makeText(this, ErrorMessageAdapter.getErrorCauseMessage(result, operation, getResources()),
 +            Toast msg = Toast.makeText(this,
 +                    ErrorMessageAdapter.getErrorCauseMessage(result, operation, getResources()),
-                     Toast.LENGTH_LONG); 
+                     Toast.LENGTH_LONG);
              msg.show();
-             
+ 
              if (result.isSslRecoverableException()) {
                  mLastSslUntrustedServerResult = result;
                  showUntrustedCertDialog(mLastSslUntrustedServerResult);
@@@ -1435,44 -1663,55 +1455,44 @@@
          }
      }
  
 -    private void onSynchronizeFileOperationFinish(SynchronizeFileOperation operation, RemoteOperationResult result) {
 -        dismissLoadingDialog();
 -        OCFile syncedFile = operation.getLocalFile();
 -        if (!result.isSuccess()) {
 -            if (result.getCode() == ResultCode.SYNC_CONFLICT) {
 -                Intent i = new Intent(this, ConflictsResolveActivity.class);
 -                i.putExtra(ConflictsResolveActivity.EXTRA_FILE, syncedFile);
 -                i.putExtra(ConflictsResolveActivity.EXTRA_ACCOUNT, getAccount());
 -                startActivity(i);
 -
 -            }
 -
 -        } else {
 +    private void onSynchronizeFileOperationFinish(SynchronizeFileOperation operation,
 +                                                  RemoteOperationResult result) {
 +        if (result.isSuccess()) {
              if (operation.transferWasRequested()) {
 +                OCFile syncedFile = operation.getLocalFile();
                  onTransferStateChanged(syncedFile, true, true);
 -
 -            } else {
 -                Toast msg = Toast.makeText(this, ErrorMessageAdapter.getErrorCauseMessage(result, operation, getResources()),
 -                        Toast.LENGTH_LONG);
 -                msg.show();
 +                invalidateOptionsMenu();
              }
          }
      }
  
      /**
 -     * Updates the view associated to the activity after the finish of an operation trying create a new folder
 -     *
 -     * @param operation Creation operation performed.
 -     * @param result    Result of the creation.
 +     * Updates the view associated to the activity after the finish of an operation trying create a
 +     * new folder
 +     * 
 +     * @param operation     Creation operation performed.
 +     * @param result        Result of the creation.
       */
 -    private void onCreateFolderOperationFinish(CreateFolderOperation operation, RemoteOperationResult result) {
 +    private void onCreateFolderOperationFinish(CreateFolderOperation operation,
 +                                               RemoteOperationResult result) {
          if (result.isSuccess()) {
              dismissLoadingDialog();
              refreshListOfFilesFragment();
          } else {
              dismissLoadingDialog();
              try {
-                 Toast msg = Toast.makeText(FileDisplayActivity.this, 
-                         ErrorMessageAdapter.getErrorCauseMessage(result, operation, getResources()), 
-                         Toast.LENGTH_LONG); 
+                 Toast msg = Toast.makeText(FileDisplayActivity.this,
+                         ErrorMessageAdapter.getErrorCauseMessage(result, operation, getResources()),
+                         Toast.LENGTH_LONG);
                  msg.show();
  
              } catch (NotFoundException e) {
-                 Log_OC.e(TAG, "Error while trying to show fail message " , e);
+                 Log_OC.e(TAG, "Error while trying to show fail message ", e);
              }
          }
      }
  
-     
+ 
      /**
       * {@inheritDoc}
       */
@@@ -1480,25 -1719,23 +1500,25 @@@
      public void onTransferStateChanged(OCFile file, boolean downloading, boolean uploading) {
          refreshListOfFilesFragment();
          FileFragment details = getSecondFragment();
 -        if (details != null && details instanceof FileDetailFragment && file.equals(details.getFile())) {
 +        if (details != null && details instanceof FileDetailFragment &&
 +                file.equals(details.getFile()) ) {
              if (downloading || uploading) {
-                 ((FileDetailFragment)details).updateFileDetails(file, getAccount());
+                 ((FileDetailFragment) details).updateFileDetails(file, getAccount());
              } else {
                  if (!file.fileExists()) {
                      cleanSecondFragment();
                  } else {
-                     ((FileDetailFragment)details).updateFileDetails(false, true);
+                     ((FileDetailFragment) details).updateFileDetails(false, true);
                  }
              }
          }
-             
+ 
      }
  
  
      private void requestForDownload() {
          Account account = getAccount();
 +        //if (!mWaitingToPreview.isDownloading()) {
          if (!mDownloaderBinder.isDownloading(account, mWaitingToPreview)) {
              Intent i = new Intent(this, FileDownloader.class);
              i.putExtra(FileDownloader.EXTRA_ACCOUNT, account);
@@@ -1514,21 -1751,20 +1534,21 @@@
              if (file.isFolder()) {
                  return file;
              } else if (getStorageManager() != null) {
 -                String parentPath = file.getRemotePath().substring(0, file.getRemotePath().lastIndexOf(file.getFileName()));
 +                String parentPath = file.getRemotePath().substring(0,
 +                        file.getRemotePath().lastIndexOf(file.getFileName()));
                  return getStorageManager().getFileByPath(parentPath);
              }
          }
          return null;
      }
-     
+ 
      public void startSyncFolderOperation(OCFile folder, boolean ignoreETag) {
-         long currentSyncTime = System.currentTimeMillis(); 
-         
+         long currentSyncTime = System.currentTimeMillis();
+ 
          mSyncInProgress = true;
-                 
+ 
          // perform folder synchronization
 -        RemoteOperation synchFolderOp = new SynchronizeFolderOperation(folder,
 +        RemoteOperation synchFolderOp = new RefreshFolderOperation( folder,
                  currentSyncTime,
                  false,
                  getFileOperationsHelper().isSharedSupported(),
@@@ -1537,107 -1773,118 +1557,123 @@@
                  getAccount(),
                  getApplicationContext()
          );
 -        synchFolderOp.execute(getAccount(), this, null, null);
 +        synchFolderOp.execute(getAccount(), MainApp.getAppContext(), this, null, null);
-         
+ 
          setSupportProgressBarIndeterminateVisibility(true);
  
          setBackgroundText();
      }
  
      /**
-      * Show untrusted cert dialog 
+      * Show untrusted cert dialog
       */
      public void showUntrustedCertDialog(RemoteOperationResult result) {
          // Show a dialog with the certificate info
 -        SslUntrustedCertDialog dialog = SslUntrustedCertDialog.newInstanceForFullSslError((CertificateCombinedException) result.getException());
 +        SslUntrustedCertDialog dialog = SslUntrustedCertDialog.newInstanceForFullSslError(
 +                (CertificateCombinedException) result.getException());
          FragmentManager fm = getSupportFragmentManager();
          FragmentTransaction ft = fm.beginTransaction();
          dialog.show(ft, DIALOG_UNTRUSTED_CERT);
      }
-     
+ 
      private void requestForDownload(OCFile file) {
          Account account = getAccount();
 -        if (!mDownloaderBinder.isDownloading(account, file)) {
 +        if (!mDownloaderBinder.isDownloading(account, mWaitingToPreview)) {
              Intent i = new Intent(this, FileDownloader.class);
              i.putExtra(FileDownloader.EXTRA_ACCOUNT, account);
              i.putExtra(FileDownloader.EXTRA_FILE, file);
              startService(i);
          }
      }
-     
-     private void sendDownloadedFile(){
+ 
+     private void sendDownloadedFile() {
          getFileOperationsHelper().sendDownloadedFile(mWaitingToSend);
          mWaitingToSend = null;
      }
  
-     
+ 
      /**
       * Requests the download of the received {@link OCFile} , updates the UI
       * to monitor the download progress and prepares the activity to send the file
       * when the download finishes.
-      * 
-      * @param file          {@link OCFile} to download and preview.
+      *
+      * @param file {@link OCFile} to download and preview.
       */
      public void startDownloadForSending(OCFile file) {
          mWaitingToSend = file;
          requestForDownload(mWaitingToSend);
-         boolean hasSecondFragment = (getSecondFragment()!= null);
+         boolean hasSecondFragment = (getSecondFragment() != null);
          updateFragmentsVisibility(hasSecondFragment);
      }
-     
+ 
      /**
       * Opens the image gallery showing the image {@link OCFile} received as parameter.
-      * 
-      * @param file                      Image {@link OCFile} to show.
+      *
+      * @param file Image {@link OCFile} to show.
       */
      public void startImagePreview(OCFile file) {
          Intent showDetailsIntent = new Intent(this, PreviewImageActivity.class);
          showDetailsIntent.putExtra(EXTRA_FILE, file);
          showDetailsIntent.putExtra(EXTRA_ACCOUNT, getAccount());
          startActivity(showDetailsIntent);
-         
      }
  
      /**
       * Stars the preview of an already down media {@link OCFile}.
 -     *
 -     * @param file                  Media {@link OCFile} to preview.
 -     * @param startPlaybackPosition Media position where the playback will be started, in milliseconds.
 -     * @param autoplay              When 'true', the playback will start without user interactions.
 +     * 
 +     * @param file                      Media {@link OCFile} to preview.
 +     * @param startPlaybackPosition     Media position where the playback will be started,
 +     *                                  in milliseconds.
 +     * @param autoplay                  When 'true', the playback will start without user
 +     *                                  interactions.
       */
      public void startMediaPreview(OCFile file, int startPlaybackPosition, boolean autoplay) {
 -        Fragment mediaFragment = new PreviewMediaFragment(file, getAccount(), startPlaybackPosition, autoplay);
 +        Fragment mediaFragment = new PreviewMediaFragment(file, getAccount(), startPlaybackPosition,
 +                autoplay);
          setSecondFragment(mediaFragment);
          updateFragmentsVisibility(true);
 -        updateNavigationElementsInActionBar(file);
 +        updateActionBarTitleAndHomeButton(file);
          setFile(file);
      }
  
      /**
+      * Stars the preview of a text file {@link OCFile}.
+      *
+      * @param file Text {@link OCFile} to preview.
+      */
+     public void startTextPreview(OCFile file) {
+         Bundle args = new Bundle();
+         args.putParcelable(EXTRA_FILE, file);
+         args.putParcelable(EXTRA_ACCOUNT, getAccount());
 -        Fragment textPreviewFragment = Fragment.instantiate(getApplicationContext(), PreviewTextFragment.class.getName(), args);
++        Fragment textPreviewFragment = Fragment.instantiate(getApplicationContext(),
++                PreviewTextFragment.class.getName(), args);
+         setSecondFragment(textPreviewFragment);
+         updateFragmentsVisibility(true);
 -        updateNavigationElementsInActionBar(file);
++        //updateNavigationElementsInActionBar(file);
+         setFile(file);
+     }
+ 
+     /**
       * Requests the download of the received {@link OCFile} , updates the UI
       * to monitor the download progress and prepares the activity to preview
       * or open the file when the download finishes.
-      * 
-      * @param file          {@link OCFile} to download and preview.
+      *
+      * @param file {@link OCFile} to download and preview.
       */
      public void startDownloadForPreview(OCFile file) {
 -        Fragment detailFragment = new FileDetailFragment(file, getAccount());
 +        Fragment detailFragment = FileDetailFragment.newInstance(file, getAccount());
          setSecondFragment(detailFragment);
          mWaitingToPreview = file;
          requestForDownload();
          updateFragmentsVisibility(true);
 -        updateNavigationElementsInActionBar(file);
 +        updateActionBarTitleAndHomeButton(file);
          setFile(file);
      }
  
  
      public void cancelTransference(OCFile file) {
          getFileOperationsHelper().cancelTransference(file);
-         if (mWaitingToPreview != null && 
+         if (mWaitingToPreview != null &&
                  mWaitingToPreview.getRemotePath().equals(file.getRemotePath())) {
              mWaitingToPreview = null;
          }
@@@ -1670,19 -1917,15 +1706,19 @@@
          }
      }
  
-     private void sortByDate(boolean ascending){
+     private void sortByDate(boolean ascending) {
          getListOfFilesFragment().sortByDate(ascending);
      }
  
-     private void sortBySize(boolean ascending){
+     private void sortBySize(boolean ascending) {
          getListOfFilesFragment().sortBySize(ascending);
      }
  
-     private void sortByName(boolean ascending){
+     private void sortByName(boolean ascending) {
          getListOfFilesFragment().sortByName(ascending);
      }
 +
 +   public void allFilesOption() {
 +       browseToRoot();
 +   }
  }
diff --combined src/com/owncloud/android/ui/fragment/OCFileListFragment.java
index 47d99925,ec0e4bd1..8f89cd88
--- a/src/com/owncloud/android/ui/fragment/OCFileListFragment.java
+++ b/src/com/owncloud/android/ui/fragment/OCFileListFragment.java
@@@ -1,11 -1,6 +1,11 @@@
 -/* ownCloud Android client application
 +/**
 + *   ownCloud Android client application
 + *
 + *   @author Bartek Przybylski
 + *   @author masensio
 + *   @author David A. Velasco
   *   Copyright (C) 2011  Bartek Przybylski
 - *   Copyright (C) 2012-2014 ownCloud Inc.
 + *   Copyright (C) 2015 ownCloud Inc.
   *
   *   This program is free software: you can redistribute it and/or modify
   *   it under the terms of the GNU General Public License version 2,
@@@ -23,8 -18,10 +23,8 @@@
  package com.owncloud.android.ui.fragment;
  
  import java.io.File;
 -import java.util.Vector;
  
  import android.app.Activity;
 -import android.content.Context;
  import android.content.Intent;
  import android.os.Bundle;
  import android.support.v4.widget.SwipeRefreshLayout;
@@@ -34,15 -31,14 +34,15 @@@ import android.view.MenuItem
  import android.view.View;
  import android.widget.AdapterView;
  import android.widget.AdapterView.AdapterContextMenuInfo;
 -import android.widget.TextView;
 -import android.view.LayoutInflater;
  
  import com.owncloud.android.R;
 +import com.owncloud.android.authentication.AccountUtils;
  import com.owncloud.android.datamodel.FileDataStorageManager;
  import com.owncloud.android.datamodel.OCFile;
  import com.owncloud.android.files.FileMenuFilter;
  import com.owncloud.android.lib.common.utils.Log_OC;
 +import com.owncloud.android.lib.resources.status.OwnCloudVersion;
 +import com.owncloud.android.ui.activity.FileActivity;
  import com.owncloud.android.ui.activity.FileDisplayActivity;
  import com.owncloud.android.ui.activity.FolderPickerActivity;
  import com.owncloud.android.ui.activity.OnEnforceableRefreshListener;
@@@ -52,12 -48,16 +52,13 @@@ import com.owncloud.android.ui.dialog.R
  import com.owncloud.android.ui.dialog.RenameFileDialogFragment;
  import com.owncloud.android.ui.preview.PreviewImageFragment;
  import com.owncloud.android.ui.preview.PreviewMediaFragment;
 +import com.owncloud.android.utils.FileStorageUtils;
+ import com.owncloud.android.ui.preview.PreviewTextFragment;
  
  /**
   * A Fragment that lists all files and folders in a given path.
   * 
 - * TODO refactorize to get rid of direct dependency on FileDisplayActivity
 - * 
 - * @author Bartek Przybylski
 - * @author masensio
 - * @author David A. Velasco
 + * TODO refactor to get rid of direct dependency on FileDisplayActivity
   */
  public class OCFileListFragment extends ExtendedListFragment {
      
@@@ -75,11 -75,10 +76,11 @@@
     
      private OCFile mFile = null;
      private FileListListAdapter mAdapter;
 -    private View mFooterView;
 +    private boolean mJustFolders;
      
      private OCFile mTargetFile;
 -
 +    
 +   
      
      /**
       * {@inheritDoc}
@@@ -124,23 -123,22 +125,23 @@@
              mFile = savedInstanceState.getParcelable(KEY_FILE);
          }
  
 -        mFooterView = ((LayoutInflater) getActivity().getSystemService(Context.LAYOUT_INFLATER_SERVICE)).inflate(
 -                        R.layout.list_footer, null, false);
 -        setFooterView(mFooterView);
 +        if (mJustFolders) {
 +            setFooterEnabled(false);
 +        } else {
 +            setFooterEnabled(true);
 +        }
  
          Bundle args = getArguments();
 -        boolean justFolders = (args == null) ? false : args.getBoolean(ARG_JUST_FOLDERS, false); 
 +        mJustFolders = (args == null) ? false : args.getBoolean(ARG_JUST_FOLDERS, false);
          mAdapter = new FileListListAdapter(
 -                justFolders,
 -                getSherlockActivity(), 
 +                mJustFolders,
 +                getActivity(),
                  mContainerActivity
                  );
          setListAdapter(mAdapter);
  
 -        registerForContextMenu(getListView());
 -        getListView().setOnCreateContextMenuListener(this);
 -    }
 +        registerForContextMenu();
 +  }
  
      /**
       * Saves the current listed folder.
@@@ -184,9 -182,8 +185,9 @@@
                  moveCount++;
              }   // exit is granted because storageManager.getFileByPath("/") never returns null
              mFile = parentDir;
 -            
 -            listDirectory(mFile);
 +
 +            // TODO Enable when "On Device" is recovered ?
 +            listDirectory(mFile /*, MainApp.getOnlyOnDevice()*/);
  
              onRefresh(false);
              
@@@ -204,8 -201,7 +205,8 @@@
          if (file != null) {
              if (file.isFolder()) { 
                  // update state and view of this fragment
 -                listDirectory(file);
 +                // TODO Enable when "On Device" is recovered ?
 +                listDirectory(file/*, MainApp.getOnlyOnDevice()*/);
                  // then, notify parent activity to let it update its state and view
                  mContainerActivity.onBrowsedDownTo(file);
                  // save index and top position
@@@ -215,7 -211,8 +216,8 @@@
                  if (PreviewImageFragment.canBePreviewed(file)) {
                      // preview image - it handles the download, if needed
                      ((FileDisplayActivity)mContainerActivity).startImagePreview(file);
-                     
+                 } else if (PreviewTextFragment.canBePreviewed(file)){
+                     ((FileDisplayActivity)mContainerActivity).startTextPreview(file);
                  } else if (file.isDown()) {
                      if (PreviewMediaFragment.canBePreviewed(file)) {
                          // media preview
@@@ -248,7 -245,7 +250,7 @@@
          boolean allowContextualActions = 
                  (args == null) ? true : args.getBoolean(ARG_ALLOW_CONTEXTUAL_ACTIONS, true); 
          if (allowContextualActions) {
 -            MenuInflater inflater = getSherlockActivity().getMenuInflater();
 +            MenuInflater inflater = getActivity().getMenuInflater();
              inflater.inflate(R.menu.file_actions_menu, menu);
              AdapterContextMenuInfo info = (AdapterContextMenuInfo) menuInfo;
              OCFile targetFile = (OCFile) mAdapter.getItem(info.position);
@@@ -258,14 -255,20 +260,14 @@@
                      targetFile,
                      mContainerActivity.getStorageManager().getAccount(),
                      mContainerActivity,
 -                    getSherlockActivity()
 +                    getActivity()
                  );
                  mf.filter(menu);
              }
 -            
 -            /// additional restrictions for this fragment 
 -            // TODO allow in the future 'open with' for previewable files
 -            MenuItem item = menu.findItem(R.id.action_open_file_with);
 -            if (item != null) {
 -                item.setVisible(false);
 -                item.setEnabled(false);
 -            }
 +                 
              /// TODO break this direct dependency on FileDisplayActivity... if possible
 -            FileFragment frag = ((FileDisplayActivity)getSherlockActivity()).getSecondFragment();
 +            MenuItem item = menu.findItem(R.id.action_open_file_with);
 +            FileFragment frag = ((FileDisplayActivity)getActivity()).getSecondFragment();
              if (frag != null && frag instanceof FileDetailFragment && 
                      frag.getFile().getFileId() == targetFile.getFileId()) {
                  item = menu.findItem(R.id.action_see_details);
@@@ -290,10 -293,6 +292,10 @@@
                  mContainerActivity.getFileOperationsHelper().shareFileWithLink(mTargetFile);
                  return true;
              }
 +            case R.id.action_open_file_with: {
 +                mContainerActivity.getFileOperationsHelper().openFile(mTargetFile);
 +                return true;
 +            }
              case R.id.action_unshare_file: {
                  mContainerActivity.getFileOperationsHelper().unshareFileWithLink(mTargetFile);
                  return true;
@@@ -341,14 -340,6 +343,14 @@@
                  getActivity().startActivityForResult(action, FileDisplayActivity.ACTION_MOVE_FILES);
                  return true;
              }
 +            case R.id.action_favorite_file:{
 +                mContainerActivity.getFileOperationsHelper().toggleFavorite(mTargetFile, true);
 +                return true;
 +            }
 +            case R.id.action_unfavorite_file:{
 +                mContainerActivity.getFileOperationsHelper().toggleFavorite(mTargetFile, false);
 +                return true;
 +            }
              default:
                  return super.onContextItemSelected(item); 
          }
@@@ -367,15 -358,8 +369,15 @@@
      /**
       * Calls {@link OCFileListFragment#listDirectory(OCFile)} with a null parameter
       */
 -    public void listDirectory(){
 +    public void listDirectory(/*boolean onlyOnDevice*/){
          listDirectory(null);
 +        // TODO Enable when "On Device" is recovered ?
 +        // listDirectory(null, onlyOnDevice);
 +    }
 +    
 +    public void refreshDirectory(){
 +        // TODO Enable when "On Device" is recovered ?
 +        listDirectory(getCurrentFile()/*, MainApp.getOnlyOnDevice()*/);
      }
      
      /**
@@@ -385,7 -369,7 +387,7 @@@
       * 
       * @param directory File to be listed
       */
 -    public void listDirectory(OCFile directory) {
 +    public void listDirectory(OCFile directory/*, boolean onlyOnDevice*/) {
          FileDataStorageManager storageManager = mContainerActivity.getStorageManager();
          if (storageManager != null) {
  
@@@ -406,101 -390,66 +408,101 @@@
                  directory = storageManager.getFileById(directory.getParentId());
              }
  
 -            mAdapter.swapDirectory(directory, storageManager);
 +            // TODO Enable when "On Device" is recovered ?
 +            mAdapter.swapDirectory(directory, storageManager/*, onlyOnDevice*/);
              if (mFile == null || !mFile.equals(directory)) {
 -                mList.setSelectionFromTop(0, 0);
 +                mCurrentListView.setSelection(0);
              }
              mFile = directory;
 -            
 -            // Update Footer
 -            TextView footerText = (TextView) mFooterView.findViewById(R.id.footerText);
 -            Log_OC.d("footer", String.valueOf(System.currentTimeMillis()));
 -            footerText.setText(generateFooterText(directory));
 -            Log_OC.d("footer", String.valueOf(System.currentTimeMillis()));
 +
 +            updateLayout();
 +
          }
      }
 -    
 -    private String generateFooterText(OCFile directory) {
 -        Integer files = 0;
 -        Integer folders = 0;
  
 -        FileDataStorageManager storageManager = mContainerActivity.getStorageManager();
 -        Vector<OCFile> mFiles = storageManager.getFolderContent(mFile);
 +    private void updateLayout() {
 +        if (!mJustFolders) {
 +            int filesCount = 0, foldersCount = 0, imagesCount = 0;
 +            int count = mAdapter.getCount();
 +            OCFile file;
 +            for (int i=0; i < count ; i++) {
 +                file = (OCFile) mAdapter.getItem(i);
 +                if (file.isFolder()) {
 +                    foldersCount++;
 +                } else {
 +                    filesCount++;
 +                    if (file.isImage()){
 +                        imagesCount++;
 +                    }
 +                }
 +            }
 +            // set footer text
 +            setFooterText(generateFooterText(filesCount, foldersCount));
  
 -        for (OCFile ocFile : mFiles) {
 -            if (ocFile.isFolder()) {
 -                folders++;
 +            // decide grid vs list view
 +            OwnCloudVersion version = AccountUtils.getServerVersion(
 +                    ((FileActivity)mContainerActivity).getAccount());
 +            if (version != null && version.supportsRemoteThumbnails() &&
 +                imagesCount > 0 && imagesCount == filesCount) {
 +                switchToGridView();
              } else {
 -                files++;
 +                switchToListView();
              }
          }
 +    }
 +
 +    private String generateFooterText(int filesCount, int foldersCount) {
 +        String output;
 +        if (filesCount <= 0) {
 +            if (foldersCount <= 0) {
 +                output = "";
 +
 +            } else if (foldersCount == 1) {
 +                output = getResources().getString(R.string.file_list__footer__folder);
 +
 +            } else { // foldersCount > 1
 +                output = getResources().getString(R.string.file_list__footer__folders, foldersCount);
 +            }
 +
 +        } else if (filesCount == 1) {
 +            if (foldersCount <= 0) {
 +                output = getResources().getString(R.string.file_list__footer__file);
 +
 +            } else if (foldersCount == 1) {
 +                output = getResources().getString(R.string.file_list__footer__file_and_folder);
 +
 +            } else { // foldersCount > 1
 +                output = getResources().getString(R.string.file_list__footer__file_and_folders, foldersCount);
 +            }
 +        } else {    // filesCount > 1
 +            if (foldersCount <= 0) {
 +                output = getResources().getString(R.string.file_list__footer__files, filesCount);
 +
 +            } else if (foldersCount == 1) {
 +                output = getResources().getString(R.string.file_list__footer__files_and_folder, filesCount);
 +
 +            } else { // foldersCount > 1
 +                output = getResources().getString(
 +                        R.string.file_list__footer__files_and_folders, filesCount, foldersCount
 +                );
  
 -        String output = "";
 -       
 -        if (files > 0){
 -            if (files == 1) {
 -                output = output + files.toString() + " " + getResources().getString(R.string.file_list_file);
 -            } else {
 -                output = output + files.toString() + " " + getResources().getString(R.string.file_list_files);
              }
          }
 -        if (folders > 0 && files > 0){
 -            output = output + ", ";
 -        }
 -        if (folders == 1) {
 -            output = output + folders.toString() + " " + getResources().getString(R.string.file_list_folder);
 -        } else if (folders > 1) {
 -            output = output + folders.toString() + " " + getResources().getString(R.string.file_list_folders);
 -        }
 -        
          return output;
      }
 -    
 +
 +
      public void sortByName(boolean descending) {
 -        mAdapter.setSortOrder(FileListListAdapter.SORT_NAME, descending);
 +        mAdapter.setSortOrder(FileStorageUtils.SORT_NAME, descending);
      }
  
      public void sortByDate(boolean descending) {
 -        mAdapter.setSortOrder(FileListListAdapter.SORT_DATE, descending);
 +        mAdapter.setSortOrder(FileStorageUtils.SORT_DATE, descending);
      }
  
      public void sortBySize(boolean descending) {
 -        mAdapter.setSortOrder(FileListListAdapter.SORT_SIZE, descending);
 -    }  
 +        mAdapter.setSortOrder(FileStorageUtils.SORT_SIZE, descending);
 +    }
  
 +    
  }
diff --combined src/com/owncloud/android/ui/preview/PreviewTextFragment.java
index 00000000,bae32e13..b3384c08
mode 000000,100644..100644
--- a/src/com/owncloud/android/ui/preview/PreviewTextFragment.java
+++ b/src/com/owncloud/android/ui/preview/PreviewTextFragment.java
@@@ -1,0 -1,409 +1,406 @@@
+ package com.owncloud.android.ui.preview;
+ 
+ import android.accounts.Account;
+ import android.os.AsyncTask;
+ import android.os.Bundle;
+ import android.support.v4.app.Fragment;
+ import android.support.v4.app.FragmentManager;
+ import android.support.v4.app.FragmentTransaction;
+ import android.view.LayoutInflater;
+ import android.view.View;
+ import android.view.ViewGroup;
+ import android.widget.TextView;
+ 
 -import com.actionbarsherlock.view.Menu;
 -import com.actionbarsherlock.view.MenuInflater;
 -import com.actionbarsherlock.view.MenuItem;
+ import com.owncloud.android.R;
+ import com.owncloud.android.datamodel.OCFile;
+ import com.owncloud.android.files.FileMenuFilter;
+ import com.owncloud.android.lib.common.utils.Log_OC;
+ import com.owncloud.android.ui.activity.FileDisplayActivity;
+ import com.owncloud.android.ui.dialog.ConfirmationDialogFragment;
+ import com.owncloud.android.ui.dialog.LoadingDialog;
+ import com.owncloud.android.ui.dialog.RemoveFileDialogFragment;
+ import com.owncloud.android.ui.fragment.FileFragment;
+ 
+ import java.io.BufferedWriter;
+ import java.io.FileInputStream;
+ import java.io.IOException;
+ import java.io.StringWriter;
+ import java.lang.ref.WeakReference;
+ import java.util.Scanner;
+ 
+ public class PreviewTextFragment extends FileFragment {
+     private static final String EXTRA_FILE = "FILE";
+     private static final String EXTRA_ACCOUNT = "ACCOUNT";
+     private static final String TAG = PreviewTextFragment.class.getSimpleName();
+ 
+     private Account mAccount;
+     private TextView mTextPreview;
+     private TextLoadAsyncTask mTextLoadTask;
+ 
+     /**
+      * Creates an empty fragment for previews.
+      * <p/>
+      * MUST BE KEPT: the system uses it when tries to reinstantiate a fragment automatically
+      * (for instance, when the device is turned a aside).
+      * <p/>
+      * DO NOT CALL IT: an {@link OCFile} and {@link Account} must be provided for a successful
+      * construction
+      */
+     public PreviewTextFragment() {
+         super();
+         mAccount = null;
+     }
+ 
+     /**
+      * {@inheritDoc}
+      */
+     @Override
+     public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                              Bundle savedInstanceState) {
+         super.onCreateView(inflater, container, savedInstanceState);
+         Log_OC.e(TAG, "onCreateView");
+ 
+ 
+         View ret = inflater.inflate(R.layout.text_file_preview, container, false);
+ 
+         mTextPreview = (TextView) ret.findViewById(R.id.text_preview);
+ 
+         return ret;
+     }
+ 
+     /**
+      * {@inheritDoc}
+      */
+     @Override
+     public void onCreate(Bundle savedInstanceState) {
+         super.onCreate(savedInstanceState);
+ 
+         OCFile file = getFile();
+ 
+         Bundle args = getArguments();
+ 
+         if (file == null) {
+             file = args.getParcelable(FileDisplayActivity.EXTRA_FILE);
+         }
+ 
+         if (mAccount == null) {
+             mAccount = args.getParcelable(FileDisplayActivity.EXTRA_ACCOUNT);
+         }
+ 
+         if (savedInstanceState == null) {
+             if (file == null) {
+                 throw new IllegalStateException("Instanced with a NULL OCFile");
+             }
+             if (mAccount == null) {
+                 throw new IllegalStateException("Instanced with a NULL ownCloud Account");
+             }
+         } else {
+             file = savedInstanceState.getParcelable(EXTRA_FILE);
+             mAccount = savedInstanceState.getParcelable(EXTRA_ACCOUNT);
+         }
+         setFile(file);
+         setHasOptionsMenu(true);
+     }
+ 
+     /**
+      * {@inheritDoc}
+      */
+     @Override
+     public void onSaveInstanceState(Bundle outState) {
+         super.onSaveInstanceState(outState);
+         outState.putParcelable(PreviewImageFragment.EXTRA_FILE, getFile());
+         outState.putParcelable(PreviewImageFragment.EXTRA_ACCOUNT, mAccount);
+     }
+ 
+     @Override
+     public void onStart() {
+         super.onStart();
+         Log_OC.e(TAG, "onStart");
+ 
+         loadAndShowTextPreview();
+     }
+ 
+     private void loadAndShowTextPreview() {
+         mTextLoadTask = new TextLoadAsyncTask(new WeakReference<TextView>(mTextPreview));
+         mTextLoadTask.execute(getFile().getStoragePath());
+     }
+ 
+ 
+     /**
+      * Reads the file to preview and shows its contents. Too critical to be anonymous.
+      */
+     private class TextLoadAsyncTask extends AsyncTask<Object, Void, StringWriter> {
+         private final String DIALOG_WAIT_TAG = "DIALOG_WAIT";
+         private final WeakReference<TextView> mTextViewReference;
+ 
+         private TextLoadAsyncTask(WeakReference<TextView> textView) {
+             mTextViewReference = textView;
+         }
+ 
+ 
+         @Override
+         protected void onPreExecute() {
+             showLoadingDialog();
+         }
+ 
+         @Override
+         protected StringWriter doInBackground(java.lang.Object... params) {
+             if (params.length != 1) {
+                 throw new IllegalArgumentException("The parameter to " + TextLoadAsyncTask.class.getName() + " must be (1) the file location");
+             }
+             final String location = (String) params[0];
+ 
+             FileInputStream inputStream = null;
+             Scanner sc = null;
+             StringWriter source = new StringWriter();
+             BufferedWriter bufferedWriter = new BufferedWriter(source);
+             try {
+                 inputStream = new FileInputStream(location);
+                 sc = new Scanner(inputStream);
+                 while (sc.hasNextLine()) {
+                     bufferedWriter.append(sc.nextLine());
+                     if (sc.hasNextLine()) bufferedWriter.append("\n");
+                 }
+                 bufferedWriter.close();
+                 IOException exc = sc.ioException();
+                 if (exc != null) throw exc;
+             } catch (IOException e) {
+                 Log_OC.e(TAG, e.getMessage(), e);
+                 finish();
+             } finally {
+                 if (inputStream != null) {
+                     try {
+                         inputStream.close();
+                     } catch (IOException e) {
+                         Log_OC.e(TAG, e.getMessage(), e);
+                         finish();
+                     }
+                 }
+                 if (sc != null) {
+                     sc.close();
+                 }
+             }
+             return source;
+         }
+ 
+         @Override
+         protected void onPostExecute(final StringWriter stringWriter) {
+             final TextView textView = mTextViewReference.get();
+ 
+             if (textView != null) {
+                 textView.setText(new String(stringWriter.getBuffer()));
+                 textView.setVisibility(View.VISIBLE);
+             }
+ 
+             dismissLoadingDialog();
+         }
+ 
+         /**
+          * Show loading dialog
+          */
+         public void showLoadingDialog() {
+             // Construct dialog
+             LoadingDialog loading = new LoadingDialog(getResources().getString(R.string.wait_a_moment));
+             FragmentManager fm = getActivity().getSupportFragmentManager();
+             FragmentTransaction ft = fm.beginTransaction();
+             loading.show(ft, DIALOG_WAIT_TAG);
+         }
+ 
+         /**
+          * Dismiss loading dialog
+          */
+         public void dismissLoadingDialog() {
+             final Fragment frag = getActivity().getSupportFragmentManager().findFragmentByTag(DIALOG_WAIT_TAG);
+             if (frag != null) {
+                 LoadingDialog loading = (LoadingDialog) frag;
+                 loading.dismiss();
+             }
+         }
+     }
+ 
+     /**
+      * {@inheritDoc}
+      */
+     @Override
+     public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+         super.onCreateOptionsMenu(menu, inflater);
+         inflater.inflate(R.menu.file_actions_menu, menu);
+     }
+ 
+     /**
+      * {@inheritDoc}
+      */
+     @Override
+     public void onPrepareOptionsMenu(Menu menu) {
+         super.onPrepareOptionsMenu(menu);
+ 
+         if (mContainerActivity.getStorageManager() != null) {
+             FileMenuFilter mf = new FileMenuFilter(
+                     getFile(),
+                     mContainerActivity.getStorageManager().getAccount(),
+                     mContainerActivity,
+                     getSherlockActivity()
+             );
+             mf.filter(menu);
+         }
+ 
+         // additional restriction for this fragment
+         MenuItem item = menu.findItem(R.id.action_rename_file);
+         if (item != null) {
+             item.setVisible(false);
+             item.setEnabled(false);
+         }
+ 
+         // additional restriction for this fragment
+         item = menu.findItem(R.id.action_move);
+         if (item != null) {
+             item.setVisible(false);
+             item.setEnabled(false);
+         }
+ 
+         // this one doesn't make sense since the file has to be down in order to be previewed
+         item = menu.findItem(R.id.action_download_file);
+         if (item != null) {
+             item.setVisible(false);
+             item.setEnabled(false);
+         }
+ 
+         item = menu.findItem(R.id.action_settings);
+         if (item != null) {
+             item.setVisible(false);
+             item.setEnabled(false);
+         }
+ 
+         item = menu.findItem(R.id.action_logger);
+         if (item != null) {
+             item.setVisible(false);
+             item.setEnabled(false);
+         }
+ 
+         item = menu.findItem(R.id.action_sync_file);
+         if (item != null) {
+             item.setVisible(false);
+             item.setEnabled(false);
+         }
+ 
+         item = menu.findItem(R.id.action_sync_account);
+         if (item != null) {
+             item.setVisible(false);
+             item.setEnabled(false);
+         }
+     }
+ 
+     /**
+      * {@inheritDoc}
+      */
+     @Override
+     public boolean onOptionsItemSelected(MenuItem item) {
+         switch (item.getItemId()) {
+             case R.id.action_share_file: {
+                 mContainerActivity.getFileOperationsHelper().shareFileWithLink(getFile());
+                 return true;
+             }
+             case R.id.action_unshare_file: {
+                 mContainerActivity.getFileOperationsHelper().unshareFileWithLink(getFile());
+                 return true;
+             }
+             case R.id.action_open_file_with: {
+                 openFile();
+                 return true;
+             }
+             case R.id.action_remove_file: {
+                 RemoveFileDialogFragment dialog = RemoveFileDialogFragment.newInstance(getFile());
+                 dialog.show(getFragmentManager(), ConfirmationDialogFragment.FTAG_CONFIRMATION);
+                 return true;
+             }
+             case R.id.action_see_details: {
+                 seeDetails();
+                 return true;
+             }
+             case R.id.action_send_file: {
+                 sendFile();
+                 return true;
+             }
+             case R.id.action_sync_file: {
+                 mContainerActivity.getFileOperationsHelper().syncFile(getFile());
+                 return true;
+             }
+ 
+             default:
+                 return false;
+         }
+     }
+ 
+     /**
+      * Update the file of the fragment with file value
+      *
+      * @param file The new file to set
+      */
+     public void updateFile(OCFile file) {
+         setFile(file);
+     }
+ 
+     private void sendFile() {
+         mContainerActivity.getFileOperationsHelper().sendDownloadedFile(getFile());
+     }
+ 
+     private void seeDetails() {
+         mContainerActivity.showDetails(getFile());
+     }
+ 
+     @Override
+     public void onPause() {
+         Log_OC.e(TAG, "onPause");
+         super.onPause();
+     }
+ 
+     @Override
+     public void onResume() {
+         super.onResume();
+         Log_OC.e(TAG, "onResume");
+     }
+ 
+     @Override
+     public void onDestroy() {
+         Log_OC.e(TAG, "onDestroy");
+         super.onDestroy();
+     }
+ 
+     @Override
+     public void onStop() {
+         super.onStop();
+         Log_OC.e(TAG, "onStop");
+         if (mTextLoadTask != null)
+             mTextLoadTask.cancel(Boolean.TRUE);
+     }
+ 
+     /**
+      * Opens the previewed file with an external application.
+      */
+     private void openFile() {
+         mContainerActivity.getFileOperationsHelper().openFile(getFile());
+         finish();
+     }
+ 
+     /**
+      * Helper method to test if an {@link OCFile} can be passed to a {@link PreviewTextFragment} to be previewed.
+      *
+      * @param file File to test if can be previewed.
+      * @return 'True' if the file can be handled by the fragment.
+      */
+     public static boolean canBePreviewed(OCFile file) {
+         return (file != null && file.isDown() && file.isText());
+     }
+ 
+     /**
+      * Finishes the preview
+      */
+     private void finish() {
+         getActivity().runOnUiThread(new Runnable() {
+             @Override
+             public void run() {
+                 getSherlockActivity().onBackPressed();
+             }
+         });
+     }
+ }