Merge branch 'develop' into feature_previews
authorDavid A. Velasco <dvelasco@solidgear.es>
Thu, 4 Apr 2013 14:44:30 +0000 (16:44 +0200)
committerDavid A. Velasco <dvelasco@solidgear.es>
Thu, 4 Apr 2013 14:44:30 +0000 (16:44 +0200)
Conflicts:
AndroidManifest.xml
res/menu/file_context_menu.xml
res/menu/menu.xml
res/values-de-rDE/strings.xml
res/values/strings.xml
src/com/owncloud/android/files/services/FileUploader.java
src/com/owncloud/android/operations/UploadFileOperation.java
src/com/owncloud/android/ui/activity/FileDisplayActivity.java

24 files changed:
1  2 
AndroidManifest.xml
res/layout/file_details_fragment.xml
res/menu/file_actions_menu.xml
res/menu/main_menu.xml
res/values-de-rDE/strings.xml
res/values/strings.xml
src/com/owncloud/android/datamodel/DataStorageManager.java
src/com/owncloud/android/datamodel/FileDataStorageManager.java
src/com/owncloud/android/datamodel/OCFile.java
src/com/owncloud/android/files/services/FileDownloader.java
src/com/owncloud/android/files/services/FileUploader.java
src/com/owncloud/android/operations/ChunkedUploadFileOperation.java
src/com/owncloud/android/operations/DownloadFileOperation.java
src/com/owncloud/android/operations/UploadFileOperation.java
src/com/owncloud/android/ui/activity/FileDetailActivity.java
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
src/com/owncloud/android/ui/activity/UploadFilesActivity.java
src/com/owncloud/android/ui/dialog/IndeterminateProgressDialog.java
src/com/owncloud/android/ui/fragment/ConfirmationDialogFragment.java
src/com/owncloud/android/ui/fragment/FileDetailFragment.java
src/com/owncloud/android/ui/fragment/OCFileListFragment.java
src/eu/alefzero/webdav/ChunkFromFileChannelRequestEntity.java
src/eu/alefzero/webdav/FileRequestEntity.java
src/eu/alefzero/webdav/WebdavClient.java

              </intent-filter>\r
          </activity>\r
  \r
 -        <service android:name=".files.services.FileDownloader" >\r
 -        </service>\r
 +        <service android:name=".files.services.FileDownloader" />\r
 +        <service android:name=".files.services.FileUploader" />\r
 +        <service android:name=".media.MediaService" />\r
  \r
-         <activity android:name=".ui.activity.FileDetailActivity" />
+         <activity android:name=".ui.activity.FileDetailActivity" />\r
          <activity android:name=".ui.activity.PinCodeActivity" />\r
-         <activity android:name=".extensions.ExtensionsAvailableActivity"></activity>
+         <activity android:name=".extensions.ExtensionsAvailableActivity"></activity>\r
          <activity android:name=".extensions.ExtensionsListActivity"></activity>\r
          <activity android:name=".ui.activity.AccountSelectActivity" android:uiOptions="none" android:label="@string/prefs_accounts"></activity>\r
-         <activity android:name=".ui.activity.ConflictsResolveActivity"/>
+         <activity android:name=".ui.activity.ConflictsResolveActivity"/>\r
          <activity android:name=".ui.activity.GenericExplanationActivity"/>\r
          <activity android:name=".ui.activity.ErrorsWhileCopyingHandlerActivity"/>\r
 -        \r
 -        <service android:name=".files.services.FileUploader" >\r
 -        </service>\r
 -        <service android:name=".files.services.InstantUploadService" />\r
 +        
 +        <service android:name=".files.services.InstantUploadService" />
          <receiver android:name=".files.InstantUploadBroadcastReceiver">\r
              <intent-filter>\r
                  <action android:name="com.android.camera.NEW_PICTURE" />\r
Simple merge
index 8a06e7e,0000000..bce33eb
mode 100644,000000..100644
--- /dev/null
@@@ -1,12 -1,0 +1,31 @@@
 +<?xml version="1.0" encoding="utf-8"?>
++<!--
++  ownCloud Android client application
++
++  Copyright (C) 2012  Bartek Przybylski
++  Copyright (C) 2012-2013 ownCloud Inc.
++
++  This program is free software: you can redistribute it and/or modify
++  it under the terms of the GNU General Public License as published by
++  the Free Software Foundation, either version 2 of the License, or
++  (at your option) any later version.
++
++  This program is distributed in the hope that it will be useful,
++  but WITHOUT ANY WARRANTY; without even the implied warranty of
++  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++  GNU General Public License for more details.
++
++  You should have received a copy of the GNU General Public License
++  along with this program.  If not, see <http://www.gnu.org/licenses/>.
++-->
 +<menu         xmlns:android="http://schemas.android.com/apk/res/android">
 +    
 +      <item   android:id="@+id/action_open_file_with"                 android:title="@string/filedetails_open"                        android:icon="@android:drawable/ic_menu_edit"                                   android:orderInCategory="1" />
 +      <item   android:id="@+id/action_download_file"                  android:title="@string/filedetails_download"                                                                                                                                            android:orderInCategory="1" />
 +      <item   android:id="@+id/action_cancel_download"                android:title="@string/common_cancel_download"          android:icon="@android:drawable/ic_menu_close_clear_cancel"             android:orderInCategory="1" />
 +      <item   android:id="@+id/action_cancel_upload"                  android:title="@string/common_cancel_upload"            android:icon="@android:drawable/ic_menu_close_clear_cancel"             android:orderInCategory="1" />
 +      <item   android:id="@+id/action_rename_file"                    android:title="@string/common_rename"                           android:icon="@android:drawable/ic_menu_set_as"                                 android:orderInCategory="1" />
 +    <item     android:id="@+id/action_remove_file"                    android:title="@string/common_remove"                           android:icon="@android:drawable/ic_menu_delete"                                 android:orderInCategory="1" />
 +    <item     android:id="@+id/action_see_details"                    android:title="@string/actionbar_see_details"           android:icon="@android:drawable/ic_menu_view"                                   android:orderInCategory="1" />
 +    
 +</menu>
index 2aff9e3,0000000..a3b8d5e
mode 100644,000000..100644
--- /dev/null
@@@ -1,11 -1,0 +1,30 @@@
 +<?xml version="1.0" encoding="utf-8"?>
++<!--
++  ownCloud Android client application
++
++  Copyright (C) 2012  Bartek Przybylski
++  Copyright (C) 2012-2013 ownCloud Inc.
++
++  This program is free software: you can redistribute it and/or modify
++  it under the terms of the GNU General Public License as published by
++  the Free Software Foundation, either version 2 of the License, or
++  (at your option) any later version.
++
++  This program is distributed in the hope that it will be useful,
++  but WITHOUT ANY WARRANTY; without even the implied warranty of
++  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++  GNU General Public License for more details.
++
++  You should have received a copy of the GNU General Public License
++  along with this program.  If not, see <http://www.gnu.org/licenses/>.
++-->
 +<menu
 +  xmlns:android="http://schemas.android.com/apk/res/android">
 +    <item android:id="@+id/action_sync_account"       android:title="@string/actionbar_sync"          android:icon="@drawable/ic_action_refresh"                              android:orderInCategory="2" />
 +    <item android:id="@+id/action_create_dir"                 android:title="@string/actionbar_mkdir"         android:icon="@drawable/ic_action_create_dir"                   android:orderInCategory="2" />
 +    <item android:id="@+id/action_upload"                     android:title="@string/actionbar_upload"        android:icon="@drawable/ic_action_upload"                               android:orderInCategory="2" />
 +    <item android:id="@+id/action_settings"           android:title="@string/actionbar_settings"      android:icon="@android:drawable/ic_menu_preferences"    android:orderInCategory="2" />
 +    <item android:id="@+id/action_about_app"          android:title="@string/about_title"             android:icon="@android:drawable/ic_menu_info_details"   android:orderInCategory="2" />
 +    
 +    <!--  <item android:id="@+id/search" android:title="@string/actionbar_search" android:icon="@drawable/ic_action_search"></item>-->
 +</menu>
    <string name="conflict_keep_both">Beide behalten</string>
    <string name="conflict_overwrite">Überschreiben</string>
    <string name="conflict_dont_upload">Nicht hochladen</string>
 +  <string name="preview_image_description">Bildvorschau</string>
 +  <string name="preview_image_error_unknown_format">Das Bild kann nicht angezeigt werden</string>
 +  <string name="preview_image_error_out_of_memory">"Nicht genug Speicherplatz um das Bild anzuzeigen</string>
+   
+   <string name="actionbar_failed_instant_upload">Fehlgeschlagene Sofortuploads</string>  
+   <string name="failed_upload_headline_text">Fehlgeschlagene Sofortuploads</string>
+   <string name="failed_upload_headline_hint">Auflistung aller fehlgeschlagenen Softuploads</string>
+   <string name="failed_upload_all_cb">Alle auswählen</string>
+   <string name="failed_upload_headline_retryall_btn">Ausgewählte wiederholen</string>
+   <string name="failed_upload_headline_delete_all_btn">Ausgewählte löschen </string>
+   <string name="failed_upload_retry_text">Versuche ausgewählte erneut hochzuladen</string>
+   <string name="failed_upload_load_more_images">Load more Picrures</string>
+   <string name="failed_upload_retry_do_nothing_text">do nothing you are not online for instant upload</string>
  </resources>
      <string name="common_save_exit">Save &amp; Exit</string>
      <string name="common_exit">Leave %1$s</string>
      <string name="common_error">Error</string>
 +    <string name="common_loading">Loading &#8230;</string>
 +    <string name="common_error_unknown">Unknown error</string>
      <string name="about_title">About</string>
-     
      <string name="delete_account">Delete account</string>
      <string name="create_account">Create account</string>
-     
      <string name="upload_chooser_title">Upload from &#8230;</string>
      <string name="uploader_info_dirname">Directory name</string>
-       <string name="uploader_upload_in_progress_ticker">Uploading &#8230;</string>    
-       <string name="uploader_upload_in_progress_content">%1$d%% Uploading %2$s</string>    
-       <string name="uploader_upload_succeeded_ticker">Upload succeeded</string>
+     <string name="uploader_upload_in_progress_ticker">Uploading &#8230;</string>
+     <string name="uploader_upload_in_progress_content">%1$d%% Uploading %2$s</string>
+     <string name="uploader_upload_succeeded_ticker">Upload succeeded</string>
      <string name="uploader_upload_succeeded_content_single">%1$s was successfully uploaded</string>
      <string name="uploader_upload_succeeded_content_multiple">%1$d files were successfully uploaded</string>
      <string name="uploader_upload_failed_ticker">Upload failed</string>
      <string name="downloader_download_succeeded_content">%1$s was successfully downloaded</string>
      <string name="downloader_download_failed_ticker">Download failed</string>
      <string name="downloader_download_failed_content">Download of %1$s could not be completed</string>
 +    <string name="downloader_not_downloaded_yet">Not downloaded yet</string>
      <string name="common_choose_account">Choose account</string>
      <string name="sync_string_contacts">Contacts</string>
-       <string name="sync_fail_ticker">Synchronization failed</string>
+     <string name="sync_fail_ticker">Synchronization failed</string>
      <string name="sync_fail_content">Synchronization of %1$s could not be completed</string>
-       <string name="sync_conflicts_in_favourites_ticker">Conflicts found</string>
-       <string name="sync_conflicts_in_favourites_content">%1$d kept-in-sync files could not be sync\'ed</string>
+     <string name="sync_conflicts_in_favourites_ticker">Conflicts found</string>
+     <string name="sync_conflicts_in_favourites_content">%1$d kept-in-sync files could not be sync\'ed</string>
      <string name="sync_fail_in_favourites_ticker">Kept-in-sync files failed</string>
-       <string name="sync_fail_in_favourites_content">Contents of %1$d files could not be sync\'ed (%2$d conflicts)</string>
-       <string name="sync_foreign_files_forgotten_ticker">Some local files were forgotten</string>
-       <string name="sync_foreign_files_forgotten_content">%1$d files out of the %2$s directory could not be copied into</string>
-       <string name="sync_foreign_files_forgotten_explanation">"As of version 1.3.16, files uploaded from this device are copied into the local %1$s folder to prevent data loss when a single file is synced with multiple accounts.\n\nDue to this change, all files uploaded in previous versions of this app were copied into the %2$s folder. However, an error prevented the completion of this operation during account synchronization. You may either leave the file(s) as is and remove the link to %3$s, or move the file(s) into the %1$s directory and retain the link to %4$s.\n\nListed below are the local file(s), and the the remote file(s) in %5$s they were linked to.</string>
-     
+     <string name="sync_fail_in_favourites_content">Contents of %1$d files could not be sync\'ed (%2$d conflicts)</string>
+     <string name="sync_foreign_files_forgotten_ticker">Some local files were forgotten</string>
+     <string name="sync_foreign_files_forgotten_content">%1$d files out of the %2$s directory could not be copied into</string>
+     <string name="sync_foreign_files_forgotten_explanation">"As of version 1.3.16, files uploaded from this device are copied into the local %1$s folder to prevent data loss when a single file is synced with multiple accounts.\n\nDue to this change, all files uploaded in previous versions of this app were copied into the %2$s folder. However, an error prevented the completion of this operation during account synchronization. You may either leave the file(s) as is and remove the link to %3$s, or move the file(s) into the %1$s directory and retain the link to %4$s.\n\nListed below are the local file(s), and the the remote file(s) in %5$s they were linked to.</string>
      <string name="foreign_files_move">"Move all"</string>
      <string name="foreign_files_success">"All files were moved"</string>
      <string name="foreign_files_fail">"Some files could not be moved"</string>
      <string name="pincode_wrong">Incorrect App PIN</string>
      <string name="pincode_removed">App PIN removed</string>
      <string name="pincode_stored">App PIN stored</string>
 -
 +    
 +    <string name="media_notif_ticker">"%1$s music player"</string>
 +    <string name="media_state_playing">"%1$s (playing)"</string>
 +    <string name="media_state_loading">"%1$s (loading)"</string>
 +    <string name="media_event_done">"%1$s playback finished"</string>
 +    <string name="media_err_nothing_to_play">No media file found</string>
 +      <string name="media_err_no_account">No account provided</string>
 +    <string name="media_err_not_in_owncloud">File not in a valid account</string>
 +    <string name="media_err_unsupported">Unsupported media codec</string>
 +    <string name="media_err_io">Media file could not be read</string>
 +    <string name="media_err_malformed">Media file not correctly encoded</string>
 +    <string name="media_err_timeout">Too much time trying to play</string>
 +    <string name="media_err_invalid_progressive_playback">Media file cannot be streamed</string>
 +    <string name="media_err_unknown">Media file cannot be played with the stock media player</string>
 +    <string name="media_err_security_ex">Security error trying to play %1$s</string>
 +      <string name="media_err_io_ex">Input error trying to play %1$s</string>
 +      <string name="media_err_unexpected">Unexpected error trying to play %1$s</string>
 +      <string name="media_previous_description">Previous track button</string>
 +      <string name="media_rewind_description">Rewind button</string>
 +      <string name="media_play_pause_description">Play or pause button</string>
 +      <string name="media_forward_description">Fast forward button</string>
 +      <string name="media_next_description">Next track button</string>
      <string-array name="prefs_trackmydevice_intervall_keys">
-       <item>15 Minutes</item>
-       <item>30 Minutes</item>
-       <item>60 Minutes</item>
-       </string-array>
-       
+         <item>15 Minutes</item>
+         <item>30 Minutes</item>
+         <item>60 Minutes</item>
+     </string-array>
      <string-array name="prefs_trackmydevice_intervall_values">
-       <item>15</item>
-       <item>30</item>
-       <item>60</item>
-       </string-array>
+         <item>15</item>
+         <item>30</item>
+         <item>60</item>
+     </string-array>
      <string name="auth_trying_to_login">Trying to login…</string>
      <string name="auth_no_net_conn_title">No network connection</string>
      <string name="auth_no_net_conn_message">No network connection has been detected, check your Internet connection and try again.</string>
      <string name="ssl_validator_label_issuer">Issued by:</string>
      <string name="ssl_validator_label_CN">Common name:</string>
      <string name="ssl_validator_label_O">Organization:</string>
-       <string name="ssl_validator_label_OU">Organizational unit:</string>
-       <string name="ssl_validator_label_C">Country:</string>
-       <string name="ssl_validator_label_ST">State:</string>
-       <string name="ssl_validator_label_L">Location:</string>
+     <string name="ssl_validator_label_OU">Organizational unit:</string>
+     <string name="ssl_validator_label_C">Country:</string>
+     <string name="ssl_validator_label_ST">State:</string>
+     <string name="ssl_validator_label_L">Location:</string>
      <string name="ssl_validator_label_validity">Validity:</string>
      <string name="ssl_validator_label_validity_from">From:</string>
 -    <string name="ssl_validator_label_validity_to">To:</string>
 -    <string name="ssl_validator_label_signature">Signature:</string>
 -    <string name="ssl_validator_label_signature_algorithm">Algorithm:</string>
 -    <string name="text_placeholder">This is a placeholder</string>
 +      <string name="ssl_validator_label_validity_to">To:</string>
 +      <string name="ssl_validator_label_signature">Signature:</string>
 +      <string name="ssl_validator_label_signature_algorithm">Algorithm:</string>
 +                      
 +    <string name="placeholder_sentence">This is a placeholder</string>
 +    <string name="placeholder_filename">placeholder.txt</string>
 +    <string name="placeholder_filetype">PNG Image</string>
 +    <string name="placeholder_filesize">389 KB</string>
 +    <string name="placeholder_timestamp">2012/05/18 12:23 PM</string>
 +    <string name="placeholder_media_time">12:23:45</string>
 +    
      <string name="instant_upload_on_wifi">Upload pictures via WiFi only</string>
-       <string name="instant_upload_path">/InstantUpload</string>
-     
+     <string name="instant_upload_path">/InstantUpload</string>
      <string name="conflict_title">Update conflict</string>
      <string name="conflict_message">Remote file %s is not synchronized with local file. Continuing will replace content of file on server.</string>
      <string name="conflict_keep_both">Keep both</string>
      <string name="conflict_overwrite">Overwrite</string>
      <string name="conflict_dont_upload">Don\'t upload</string>
 -
 +    
 +    <string name="preview_image_description">Image preview</string>
 +    <string name="preview_image_error_unknown_format">This image can not be shown</string>
 +    <string name="preview_image_error_out_of_memory">"Not enough memory to show this image</string>
 +    
      <!-- we need to improve the communication of errors to the user -->
      <string name="error__upload__local_file_not_copied">%1$s could not be copied to %2$s local directory</string>
-     
+     <string name="actionbar_failed_instant_upload">Failed InstantUpload"</string>
+     <string name="failed_upload_headline_text">Failed instant uploads</string>
+     <string name="failed_upload_headline_hint">Summary of all failed instant uploads</string>
+     <string name="failed_upload_all_cb">select all</string>
+     <string name="failed_upload_headline_retryall_btn">retry all selected</string>
+     <string name="failed_upload_headline_delete_all_btn">delete all  selected from uploadqueue</string>
+     <string name="failed_upload_retry_text">retry to upload the image: </string>
+     <string name="failed_upload_load_more_images">Load more Picrures</string>
+     <string name="failed_upload_retry_do_nothing_text">do nothing you are not online for instant upload</string>
+       <string name="failed_upload_failure_text">Failure Message: </string>
+       <string name="failed_upload_quota_exceeded_text">Please check your server configuration,maybe your quota is exceeded.</string>
 -</resources>
 +</resources>
@@@ -68,9 -47,28 +49,30 @@@ import android.os.Process
  import android.util.Log;
  import android.webkit.MimeTypeMap;
  import android.widget.RemoteViews;
+ import android.widget.Toast;
  
  import com.owncloud.android.R;
+ import com.owncloud.android.authenticator.AccountAuthenticator;
+ import com.owncloud.android.datamodel.FileDataStorageManager;
+ import com.owncloud.android.datamodel.OCFile;
+ import com.owncloud.android.db.DbHandler;
+ import com.owncloud.android.network.OwnCloudClientUtils;
+ import com.owncloud.android.operations.ChunkedUploadFileOperation;
+ import com.owncloud.android.operations.RemoteOperationResult;
+ import com.owncloud.android.operations.RemoteOperationResult.ResultCode;
+ import com.owncloud.android.operations.UploadFileOperation;
+ import com.owncloud.android.ui.activity.FailedUploadActivity;
+ import com.owncloud.android.ui.activity.FileDetailActivity;
+ import com.owncloud.android.ui.activity.InstantUploadActivity;
+ import com.owncloud.android.ui.fragment.FileDetailFragment;
++import com.owncloud.android.ui.preview.PreviewImageActivity;
++import com.owncloud.android.ui.preview.PreviewImageFragment;
+ import com.owncloud.android.utils.OwnCloudVersion;
+ import eu.alefzero.webdav.OnDatatransferProgressListener;
  import eu.alefzero.webdav.WebdavClient;
+ import eu.alefzero.webdav.WebdavEntry;
+ import eu.alefzero.webdav.WebdavUtils;
  
  public class FileUploader extends Service implements OnDatatransferProgressListener {
  
                  }
                  mPendingUploads.putIfAbsent(uploadKey, newUpload);
                  newUpload.addDatatransferProgressListener(this);
 +                newUpload.addDatatransferProgressListener((FileUploaderBinder)mBinder);
                  requestedUploads.add(uploadKey);
              }
-             
          } catch (IllegalArgumentException e) {
              Log.e(TAG, "Not enough information provided in intent: " + e.getMessage());
              return START_NOT_STICKY;
      public IBinder onBind(Intent arg0) {
          return mBinder;
      }
 +    
 +    /**
 +     * Called when ALL the bound clients were onbound.
 +     */
 +    @Override
 +    public boolean onUnbind(Intent intent) {
 +        ((FileUploaderBinder)mBinder).clearListeners();
 +        return false;   // not accepting rebinding (default behaviour)
 +    }
 +    
  
      /**
-      *  Binder to let client components to perform operations on the queue of uploads.
+      * Binder to let client components to perform operations on the queue of
+      * uploads.
       * 
-      *  It provides by itself the available operations.
+      * It provides by itself the available operations.
       */
 -    public class FileUploaderBinder extends Binder {
 -
 +    public class FileUploaderBinder extends Binder implements OnDatatransferProgressListener {
 +        
 +        /** 
 +         * Map of listeners that will be reported about progress of uploads from a {@link FileUploaderBinder} instance 
 +         */
 +        private Map<String, OnDatatransferProgressListener> mBoundListeners = new HashMap<String, OnDatatransferProgressListener>();
 +        
          /**
           * Cancels a pending or current upload of a remote file.
           * 
                  upload.cancel();
              }
          }
 +        
 +        
 +        
 +        public void clearListeners() {
 +            mBoundListeners.clear();
 +        }
  
 +
 +        
 +        
          /**
-          * Returns True when the file described by 'file' is being uploaded to the ownCloud account 'account' or waiting for it
+          * Returns True when the file described by 'file' is being uploaded to
+          * the ownCloud account 'account' or waiting for it
           * 
 -         * If 'file' is a directory, returns 'true' if some of its descendant
 -         * files is downloading or waiting to download.
 +         * If 'file' is a directory, returns 'true' if some of its descendant files is uploading or waiting to upload. 
           * 
-          * @param account       Owncloud account where the remote file will be stored.
-          * @param file          A file that could be in the queue of pending uploads
+          * @param account Owncloud account where the remote file will be stored.
+          * @param file A file that could be in the queue of pending uploads
           */
          public boolean isUploading(Account account, OCFile file) {
-             if (account == null || file == null) return false;
+             if (account == null || file == null)
+                 return false;
              String targetKey = buildRemoteName(account, file);
              synchronized (mPendingUploads) {
                  if (file.isDirectory()) {
                  }
              }
          }
 +
 +
 +        /**
 +         * Adds a listener interested in the progress of the upload for a concrete file.
 +         * 
 +         * @param listener      Object to notify about progress of transfer.    
 +         * @param account       ownCloud account holding the file of interest.
 +         * @param file          {@link OCfile} of interest for listener. 
 +         */
 +        public void addDatatransferProgressListener (OnDatatransferProgressListener listener, Account account, OCFile file) {
 +            if (account == null || file == null || listener == null) return;
 +            String targetKey = buildRemoteName(account, file);
 +            mBoundListeners.put(targetKey, listener);
 +        }
 +        
 +        
 +        
 +        /**
 +         * Removes a listener interested in the progress of the upload for a concrete file.
 +         * 
 +         * @param listener      Object to notify about progress of transfer.    
 +         * @param account       ownCloud account holding the file of interest.
 +         * @param file          {@link OCfile} of interest for listener. 
 +         */
 +        public void removeDatatransferProgressListener (OnDatatransferProgressListener listener, Account account, OCFile file) {
 +            if (account == null || file == null || listener == null) return;
 +            String targetKey = buildRemoteName(account, file);
 +            if (mBoundListeners.get(targetKey) == listener) {
 +                mBoundListeners.remove(targetKey);
 +            }
 +        }
 +
 +
 +        @Override
 +        public void onTransferProgress(long progressRate) {
 +            // old way, should not be in use any more
 +        }
 +
 +
 +        @Override
 +        public void onTransferProgress(long progressRate, long totalTransferredSoFar, long totalToTransfer,
 +                String fileName) {
 +            String key = buildRemoteName(mCurrentUpload.getAccount(), mCurrentUpload.getFile());
 +            OnDatatransferProgressListener boundListener = mBoundListeners.get(key);
 +            if (boundListener != null) {
 +                boundListener.onTransferProgress(progressRate, totalTransferredSoFar, totalToTransfer, fileName);
 +            }
 +        }
 +        
      }
-     
-     
-     
-     
-     /** 
-      * Upload worker. Performs the pending uploads in the order they were requested. 
+     /**
+      * Upload worker. Performs the pending uploads in the order they were
+      * requested.
       * 
-      * Created with the Looper of a new thread, started in {@link FileUploader#onCreate()}. 
+      * Created with the Looper of a new thread, started in
+      * {@link FileUploader#onCreate()}.
       */
      private static class ServiceHandler extends Handler {
-         // don't make it a final class, and don't remove the static ; lint will warn about a possible memory leak
+         // don't make it a final class, and don't remove the static ; lint will
+         // warn about a possible memory leak
          FileUploader mService;
          public ServiceHandler(Looper looper, FileUploader service) {
              super(looper);
              if (service == null)
          file.setMimetype(we.contentType());
          file.setModificationTimestamp(we.modifiedTimestamp());
          file.setModificationTimestampAtLastSyncForData(we.modifiedTimestamp());
 -        // file.setEtag(mCurrentDownload.getEtag()); // TODO Etag, where
 -        // available
 +        // file.setEtag(mCurrentUpload.getEtag());    // TODO Etag, where available
      }
-     
-     
      private boolean checkAndFixInstantUploadDirectory(FileDataStorageManager storageManager) {
-         OCFile instantUploadDir = storageManager.getFileByPath(InstantUploadBroadcastReceiver.INSTANT_UPLOAD_DIR);
+         OCFile instantUploadDir = storageManager.getFileByPath(InstantUploadService.INSTANT_UPLOAD_DIR);
          if (instantUploadDir == null) {
-             // first instant upload in the account, or never account not synchronized after the remote InstantUpload folder was created
-             OCFile newDir = new OCFile(InstantUploadBroadcastReceiver.INSTANT_UPLOAD_DIR);
+             // first instant upload in the account, or never account not
+             // synchronized after the remote InstantUpload folder was created
+             OCFile newDir = new OCFile(InstantUploadService.INSTANT_UPLOAD_DIR);
              newDir.setMimetype("DIR");
-             newDir.setParentId(storageManager.getFileByPath(OCFile.PATH_SEPARATOR).getFileId());
-             storageManager.saveFile(newDir);
-             return true;
+             OCFile path = storageManager.getFileByPath(OCFile.PATH_SEPARATOR);
+             if (path != null) {
+                 newDir.setParentId(path.getFileId());
+                 storageManager.saveFile(newDir);
+                 return true;
+             } else {
+                 return false;
+             }
          }
          return false;
      }
      /**
       * Creates a status notification to show the upload progress
       * 
-      * @param upload    Upload operation starting.
+      * @param upload Upload operation starting.
       */
 +    @SuppressWarnings("deprecation")
      private void notifyUploadStart(UploadFileOperation upload) {
-         /// create status notification with a progress bar
+         // / create status notification with a progress bar
          mLastPercent = 0;
-         mNotification = new Notification(R.drawable.icon, getString(R.string.uploader_upload_in_progress_ticker), System.currentTimeMillis());
+         mNotification = new Notification(R.drawable.icon, getString(R.string.uploader_upload_in_progress_ticker),
+                 System.currentTimeMillis());
          mNotification.flags |= Notification.FLAG_ONGOING_EVENT;
          mDefaultNotificationContentView = mNotification.contentView;
-         mNotification.contentView = new RemoteViews(getApplicationContext().getPackageName(), R.layout.progressbar_layout);
+         mNotification.contentView = new RemoteViews(getApplicationContext().getPackageName(),
+                 R.layout.progressbar_layout);
          mNotification.contentView.setProgressBar(R.id.status_progress, 100, 0, false);
-         mNotification.contentView.setTextViewText(R.id.status_text, String.format(getString(R.string.uploader_upload_in_progress_content), 0, upload.getFileName()));
+         mNotification.contentView.setTextViewText(R.id.status_text,
+                 String.format(getString(R.string.uploader_upload_in_progress_content), 0, upload.getFileName()));
          mNotification.contentView.setImageViewResource(R.id.status_icon, R.drawable.icon);
 -
 -        // / includes a pending intent in the notification showing the details
 -        // view of the file
 -        Intent showDetailsIntent = new Intent(this, FileDetailActivity.class);
 +        
 +        /// includes a pending intent in the notification showing the details view of the file
 +        Intent showDetailsIntent = null;
 +        if (PreviewImageFragment.canBePreviewed(upload.getFile())) {
 +            showDetailsIntent = new Intent(this, PreviewImageActivity.class);
 +        } else {
 +            showDetailsIntent = new Intent(this, FileDetailActivity.class);
 +            showDetailsIntent.putExtra(FileDetailActivity.EXTRA_MODE, FileDetailActivity.MODE_DETAILS);
 +        }
          showDetailsIntent.putExtra(FileDetailFragment.EXTRA_FILE, upload.getFile());
          showDetailsIntent.putExtra(FileDetailFragment.EXTRA_ACCOUNT, upload.getAccount());
          showDetailsIntent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
      /**
       * Updates the status notification with the result of an upload operation.
       * 
-      * @param uploadResult    Result of the upload operation.
-      * @param upload          Finished upload operation
+      * @param uploadResult Result of the upload operation.
+      * @param upload Finished upload operation
       */
      private void notifyUploadResult(RemoteOperationResult uploadResult, UploadFileOperation upload) {
+         Log.d(TAG, "NotifyUploadResult with resultCode: " + uploadResult.getCode());
          if (uploadResult.isCancelled()) {
-             /// cancelled operation -> silent removal of progress notification
+             // / cancelled operation -> silent removal of progress notification
              mNotificationManager.cancel(R.string.uploader_upload_in_progress_ticker);
-             
          } else if (uploadResult.isSuccess()) {
-             /// success -> silent update of progress notification to success message 
-             mNotification.flags ^= Notification.FLAG_ONGOING_EVENT; // remove the ongoing flag
+             // / success -> silent update of progress notification to success
+             // message
+             mNotification.flags ^= Notification.FLAG_ONGOING_EVENT; // remove
+                                                                     // the
+                                                                     // ongoing
+                                                                     // flag
              mNotification.flags |= Notification.FLAG_AUTO_CANCEL;
              mNotification.contentView = mDefaultNotificationContentView;
 -
 -            // / includes a pending intent in the notification showing the
 -            // details view of the file
 -            Intent showDetailsIntent = new Intent(this, FileDetailActivity.class);
 +            
 +            /// includes a pending intent in the notification showing the details view of the file
 +            Intent showDetailsIntent = null;
 +            if (PreviewImageFragment.canBePreviewed(upload.getFile())) {
 +                showDetailsIntent = new Intent(this, PreviewImageActivity.class); 
 +            } else {
 +                showDetailsIntent = new Intent(this, FileDetailActivity.class); 
 +                showDetailsIntent.putExtra(FileDetailActivity.EXTRA_MODE, FileDetailActivity.MODE_DETAILS);
 +            }
              showDetailsIntent.putExtra(FileDetailFragment.EXTRA_FILE, upload.getFile());
              showDetailsIntent.putExtra(FileDetailFragment.EXTRA_ACCOUNT, upload.getAccount());
              showDetailsIntent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
@@@ -30,14 -30,13 +30,17 @@@ import java.util.concurrent.atomic.Atom
  
  import org.apache.commons.httpclient.HttpException;
  import org.apache.commons.httpclient.methods.PutMethod;
 +import org.apache.commons.httpclient.methods.RequestEntity;
  import org.apache.http.HttpStatus;
  
+ import android.accounts.Account;
+ import android.util.Log;
  import com.owncloud.android.datamodel.OCFile;
  import com.owncloud.android.files.services.FileUploader;
 +import com.owncloud.android.network.ProgressiveDataTransferer;
 +import com.owncloud.android.operations.RemoteOperation;
 +import com.owncloud.android.operations.RemoteOperationResult;
  import com.owncloud.android.operations.RemoteOperationResult.ResultCode;
  import com.owncloud.android.utils.FileStorageUtils;
  
@@@ -154,25 -147,11 +157,25 @@@ public class UploadFileOperation extend
      public Set<OnDatatransferProgressListener> getDataTransferListeners() {
          return mDataTransferListeners;
      }
 -
 -    public void addDatatransferProgressListener(OnDatatransferProgressListener listener) {
 -        mDataTransferListeners.add(listener);
 +    
 +    public void addDatatransferProgressListener (OnDatatransferProgressListener listener) {
 +        synchronized (mDataTransferListeners) {
 +            mDataTransferListeners.add(listener);
 +        }
 +        if (mEntity != null) {
 +            ((ProgressiveDataTransferer)mEntity).addDatatransferProgressListener(listener);
 +        }
 +    }
 +    
 +    public void removeDatatransferProgressListener(OnDatatransferProgressListener listener) {
 +        synchronized (mDataTransferListeners) {
 +            mDataTransferListeners.remove(listener);
 +        }
 +        if (mEntity != null) {
 +            ((ProgressiveDataTransferer)mEntity).removeDatatransferProgressListener(listener);
 +        }
      }
-     
      @Override
      protected RemoteOperationResult run(WebdavClient client) {
          RemoteOperationResult result = null;
          int status = -1;
          try {
              File f = new File(mFile.getStoragePath());
 -            FileRequestEntity entity = new FileRequestEntity(f, getMimeType());
 -            entity.addOnDatatransferProgressListeners(mDataTransferListeners);
 -            mPutMethod.setRequestEntity(entity);
 +            mEntity  = new FileRequestEntity(f, getMimeType());
 +            synchronized (mDataTransferListeners) {
 +                ((ProgressiveDataTransferer)mEntity).addDatatransferProgressListeners(mDataTransferListeners);
 +            }
 +            mPutMethod.setRequestEntity(mEntity);
              status = client.executeMethod(mPutMethod);
              client.exhaustResponse(mPutMethod.getResponseBodyAsStream());
-             
          } finally {
-             mPutMethod.releaseConnection();    // let the connection available for other methods
+             mPutMethod.releaseConnection(); // let the connection available for
+                                             // other methods
          }
          return status;
      }
 -/* ownCloud Android client application
 - *   Copyright (C) 2011  Bartek Przybylski
 - *   Copyright (C) 2012-2013 ownCloud Inc.
 - *
 - *   This program is free software: you can redistribute it and/or modify
 - *   it under the terms of the GNU General Public License as published by
 - *   the Free Software Foundation, either version 2 of the License, or
 - *   (at your option) any later version.
 - *
 - *   This program is distributed in the hope that it will be useful,
 - *   but WITHOUT ANY WARRANTY; without even the implied warranty of
 - *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 - *   GNU General Public License for more details.
 - *
 - *   You should have received a copy of the GNU General Public License
 - *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 - *
 - */
 +/* ownCloud Android client application\r
 + *   Copyright (C) 2011  Bartek Przybylski\r
++ *   Copyright (C) 2012-2013 ownCloud Inc.\r
 + *\r
 + *   This program is free software: you can redistribute it and/or modify\r
 + *   it under the terms of the GNU General Public License as published by\r
 + *   the Free Software Foundation, either version 3 of the License, or\r
 + *   (at your option) any later version.\r
 + *\r
 + *   This program is distributed in the hope that it will be useful,\r
 + *   but WITHOUT ANY WARRANTY; without even the implied warranty of\r
 + *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
 + *   GNU General Public License for more details.\r
 + *\r
 + *   You should have received a copy of the GNU General Public License\r
 + *   along with this program.  If not, see <http://www.gnu.org/licenses/>.\r
 + *\r
 + */\r
 +\r
 +package com.owncloud.android.ui.activity;\r
 +\r
 +import java.io.File;\r
 +\r
 +import android.accounts.Account;\r
 +import android.app.AlertDialog;\r
 +import android.app.ProgressDialog;\r
 +import android.app.AlertDialog.Builder;\r
 +import android.app.Dialog;\r
 +import android.content.BroadcastReceiver;\r
 +import android.content.ComponentName;\r
 +import android.content.ContentResolver;\r
 +import android.content.Context;\r
 +import android.content.DialogInterface;\r
 +import android.content.DialogInterface.OnClickListener;\r
 +import android.content.Intent;\r
 +import android.content.IntentFilter;\r
 +import android.content.ServiceConnection;\r
 +import android.content.SharedPreferences;\r
 +import android.content.SharedPreferences.Editor;\r
 +import android.content.pm.PackageInfo;\r
 +import android.content.pm.PackageManager.NameNotFoundException;\r
 +import android.content.res.Resources.NotFoundException;\r
 +import android.database.Cursor;\r
 +import android.graphics.Bitmap;\r
 +import android.graphics.drawable.BitmapDrawable;\r
 +import android.net.Uri;\r
 +import android.os.Bundle;\r
 +import android.os.Handler;\r
 +import android.os.IBinder;\r
 +import android.preference.PreferenceManager;\r
 +import android.provider.MediaStore;\r
 +import android.support.v4.app.Fragment;\r
 +import android.support.v4.app.FragmentTransaction;\r
 +import android.util.Log;\r
 +import android.view.View;\r
 +import android.view.ViewGroup;\r
 +import android.widget.ArrayAdapter;\r
 +import android.widget.EditText;\r
 +import android.widget.TextView;\r
 +import android.widget.Toast;\r
 +\r
 +import com.actionbarsherlock.app.ActionBar;\r
 +import com.actionbarsherlock.app.ActionBar.OnNavigationListener;\r
 +import com.actionbarsherlock.app.SherlockFragmentActivity;\r
 +import com.actionbarsherlock.view.Menu;\r
 +import com.actionbarsherlock.view.MenuInflater;\r
 +import com.actionbarsherlock.view.MenuItem;\r
 +import com.actionbarsherlock.view.Window;\r
 +import com.owncloud.android.AccountUtils;\r
 +import com.owncloud.android.authenticator.AccountAuthenticator;\r
 +import com.owncloud.android.datamodel.DataStorageManager;\r
 +import com.owncloud.android.datamodel.FileDataStorageManager;\r
 +import com.owncloud.android.datamodel.OCFile;\r
 +import com.owncloud.android.files.services.FileDownloader;\r
 +import com.owncloud.android.files.services.FileDownloader.FileDownloaderBinder;\r
 +import com.owncloud.android.files.services.FileObserverService;\r
 +import com.owncloud.android.files.services.FileUploader;\r
 +import com.owncloud.android.files.services.FileUploader.FileUploaderBinder;\r
 +import com.owncloud.android.network.OwnCloudClientUtils;\r
 +import com.owncloud.android.operations.OnRemoteOperationListener;\r
 +import com.owncloud.android.operations.RemoteOperation;\r
 +import com.owncloud.android.operations.RemoteOperationResult;\r
 +import com.owncloud.android.operations.RemoveFileOperation;\r
 +import com.owncloud.android.operations.RenameFileOperation;\r
 +import com.owncloud.android.operations.SynchronizeFileOperation;\r
 +import com.owncloud.android.operations.RemoteOperationResult.ResultCode;\r
 +import com.owncloud.android.syncadapter.FileSyncService;\r
 +import com.owncloud.android.ui.dialog.ChangelogDialog;\r
 +import com.owncloud.android.ui.dialog.SslValidatorDialog;\r
 +import com.owncloud.android.ui.dialog.SslValidatorDialog.OnSslValidatorListener;\r
 +import com.owncloud.android.ui.fragment.FileDetailFragment;\r
 +import com.owncloud.android.ui.fragment.FileFragment;\r
 +import com.owncloud.android.ui.fragment.OCFileListFragment;\r
 +import com.owncloud.android.ui.preview.PreviewImageActivity;\r
 +import com.owncloud.android.ui.preview.PreviewImageFragment;\r
 +import com.owncloud.android.ui.preview.PreviewMediaFragment;\r
 +\r
 +import com.owncloud.android.R;\r
 +import eu.alefzero.webdav.WebdavClient;\r
 +\r
 +/**\r
 + * Displays, what files the user has available in his ownCloud.\r
 + * \r
 + * @author Bartek Przybylski\r
 + * @author David A. Velasco\r
 + */\r
 +\r
 +public class FileDisplayActivity extends SherlockFragmentActivity implements\r
 +    OCFileListFragment.ContainerActivity, FileFragment.ContainerActivity, OnNavigationListener, OnSslValidatorListener, OnRemoteOperationListener {\r
 +    \r
 +    private ArrayAdapter<String> mDirectories;\r
 +    private OCFile mCurrentDir = null;\r
 +    private OCFile mCurrentFile = null;\r
 +\r
 +    private DataStorageManager mStorageManager;\r
 +    private SyncBroadcastReceiver mSyncBroadcastReceiver;\r
 +    private UploadFinishReceiver mUploadFinishReceiver;\r
 +    private DownloadFinishReceiver mDownloadFinishReceiver;\r
 +    private FileDownloaderBinder mDownloaderBinder = null;\r
 +    private FileUploaderBinder mUploaderBinder = null;\r
 +    private ServiceConnection mDownloadConnection = null, mUploadConnection = null;\r
 +    private RemoteOperationResult mLastSslUntrustedServerResult = null;\r
 +    \r
 +    private OCFileListFragment mFileList;\r
 +    \r
 +    private boolean mDualPane;\r
 +    \r
 +    private static final int DIALOG_SETUP_ACCOUNT = 0;\r
 +    private static final int DIALOG_CREATE_DIR = 1;\r
 +    private static final int DIALOG_ABOUT_APP = 2;\r
 +    public static final int DIALOG_SHORT_WAIT = 3;\r
 +    private static final int DIALOG_CHOOSE_UPLOAD_SOURCE = 4;\r
 +    private static final int DIALOG_SSL_VALIDATOR = 5;\r
 +    private static final int DIALOG_CERT_NOT_SAVED = 6;\r
 +    private static final String DIALOG_CHANGELOG_TAG = "DIALOG_CHANGELOG";\r
 +\r
 +    \r
 +    private static final int ACTION_SELECT_CONTENT_FROM_APPS = 1;\r
 +    private static final int ACTION_SELECT_MULTIPLE_FILES = 2;\r
 +    \r
 +    private static final String TAG = "FileDisplayActivity";\r
 +\r
 +    private static int[] mMenuIdentifiersToPatch = {R.id.action_about_app};\r
 +    \r
 +    private OCFile mWaitingToPreview;\r
 +    private Handler mHandler;\r
 +\r
 +    \r
 +    @Override\r
 +    public void onCreate(Bundle savedInstanceState) {\r
 +        Log.d(getClass().toString(), "onCreate() start");\r
 +        super.onCreate(savedInstanceState);\r
 +\r
 +        /// Load of parameters from received intent\r
 +        mCurrentDir = getIntent().getParcelableExtra(FileDetailFragment.EXTRA_FILE); // no check necessary, mCurrenDir == null if the parameter is not in the intent\r
 +        Account account = getIntent().getParcelableExtra(FileDetailFragment.EXTRA_ACCOUNT);\r
 +        if (account != null)\r
 +            AccountUtils.setCurrentOwnCloudAccount(this, account.name);\r
 +        \r
 +        /// Load of saved instance state: keep this always before initDataFromCurrentAccount()\r
 +        if(savedInstanceState != null) {\r
 +            // TODO - test if savedInstanceState should take precedence over file in the intent ALWAYS (now), NEVER, or SOME TIMES\r
 +            mCurrentDir = savedInstanceState.getParcelable(FileDetailFragment.EXTRA_FILE);\r
 +            mWaitingToPreview = (OCFile) savedInstanceState.getParcelable(FileDetailActivity.KEY_WAITING_TO_PREVIEW);\r
 +\r
 +        } else {\r
 +            mWaitingToPreview = null;\r
 +        }\r
 +        \r
 +        if (!AccountUtils.accountsAreSetup(this)) {\r
 +            /// no account available: FORCE ACCOUNT CREATION\r
 +            mStorageManager = null;\r
 +            createFirstAccount();\r
 +            \r
 +        } else {    /// at least an account is available\r
 +            \r
 +            initDataFromCurrentAccount();   // it checks mCurrentDir and mCurrentFile with the current account\r
 +            \r
 +        }\r
 +        \r
 +        mUploadConnection = new ListServiceConnection(); \r
 +        mDownloadConnection = new ListServiceConnection();\r
 +        bindService(new Intent(this, FileUploader.class), mUploadConnection, Context.BIND_AUTO_CREATE);\r
 +        bindService(new Intent(this, FileDownloader.class), mDownloadConnection, Context.BIND_AUTO_CREATE);\r
 +\r
 +        // PIN CODE request ;  best location is to decide, let's try this first\r
 +        if (getIntent().getAction() != null && getIntent().getAction().equals(Intent.ACTION_MAIN) && savedInstanceState == null) {\r
 +            requestPinCode();\r
 +        }\r
 +\r
 +        // file observer\r
 +        Intent observer_intent = new Intent(this, FileObserverService.class);\r
 +        observer_intent.putExtra(FileObserverService.KEY_FILE_CMD, FileObserverService.CMD_INIT_OBSERVED_LIST);\r
 +        startService(observer_intent);\r
 +        \r
 +            \r
 +        /// USER INTERFACE\r
 +        requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);\r
 +            \r
 +        // Drop-down navigation \r
 +        mDirectories = new CustomArrayAdapter<String>(this, R.layout.sherlock_spinner_dropdown_item);\r
 +        OCFile currFile = mCurrentDir;\r
 +        while(currFile != null && currFile.getFileName() != OCFile.PATH_SEPARATOR) {\r
 +            mDirectories.add(currFile.getFileName());\r
 +            currFile = mStorageManager.getFileById(currFile.getParentId());\r
 +        }\r
 +        mDirectories.add(OCFile.PATH_SEPARATOR);\r
 +\r
 +        // Inflate and set the layout view\r
 +        setContentView(R.layout.files);    \r
 +        mFileList = (OCFileListFragment) getSupportFragmentManager().findFragmentById(R.id.fileList);\r
 +        mDualPane = (findViewById(R.id.file_details_container) != null);\r
 +        if (mDualPane) {\r
 +            initFileDetailsInDualPane();\r
 +        } else {\r
 +            // quick patchES to fix problem in turn from landscape to portrait, when a file is selected in the right pane\r
 +            // TODO serious refactorization in activities and fragments providing file browsing and handling \r
 +            if (mCurrentFile != null) {\r
 +                onFileClick(mCurrentFile);\r
 +                mCurrentFile = null;\r
 +            }\r
 +            Fragment rightPanel = getSupportFragmentManager().findFragmentByTag(FileDetailFragment.FTAG);\r
 +            if (rightPanel != null) {\r
 +                FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();\r
 +                transaction.remove(rightPanel);\r
 +                transaction.commit();\r
 +            }\r
 +        }\r
 +            \r
 +        // Action bar setup\r
 +        ActionBar actionBar = getSupportActionBar();\r
 +        actionBar.setHomeButtonEnabled(true);   // mandatory since Android ICS, according to the official documentation\r
 +        actionBar.setDisplayHomeAsUpEnabled(mCurrentDir != null && mCurrentDir.getParentId() != 0);\r
 +        actionBar.setDisplayShowTitleEnabled(false);\r
 +        actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_LIST);\r
 +        actionBar.setListNavigationCallbacks(mDirectories, this);\r
 +        setSupportProgressBarIndeterminateVisibility(false);        // always AFTER setContentView(...) ; to workaround bug in its implementation\r
 +        \r
 +        \r
 +        // show changelog, if needed\r
 +        showChangeLog();\r
 +        \r
 +        Log.d(getClass().toString(), "onCreate() end");\r
 +    }\r
 +\r
 +    \r
 +    /**\r
 +     * Shows a dialog with the change log of the current version after each app update\r
 +     * \r
 +     *  TODO make it permanent; by now, only to advice the workaround app for 4.1.x\r
 +     */\r
 +    private void showChangeLog() {\r
 +        if (android.os.Build.VERSION.SDK_INT == android.os.Build.VERSION_CODES.JELLY_BEAN) {\r
 +            final String KEY_VERSION = "version";\r
 +            SharedPreferences sharedPref = PreferenceManager.getDefaultSharedPreferences(getApplicationContext());\r
 +            int currentVersionNumber = 0;\r
 +            int savedVersionNumber = sharedPref.getInt(KEY_VERSION, 0);\r
 +            try {\r
 +                PackageInfo pi          = getPackageManager().getPackageInfo(getPackageName(), 0);\r
 +                currentVersionNumber    = pi.versionCode;\r
 +            } catch (Exception e) {}\r
 +     \r
 +            if (currentVersionNumber > savedVersionNumber) {\r
 +                ChangelogDialog.newInstance(true).show(getSupportFragmentManager(), DIALOG_CHANGELOG_TAG);\r
 +                Editor editor   = sharedPref.edit();\r
 +                editor.putInt(KEY_VERSION, currentVersionNumber);\r
 +                editor.commit();\r
 +            }\r
 +        }\r
 +    }\r
 +    \r
 +\r
 +    /**\r
 +     * Launches the account creation activity. To use when no ownCloud account is available\r
 +     */\r
 +    private void createFirstAccount() {\r
 +        Intent intent = new Intent(android.provider.Settings.ACTION_ADD_ACCOUNT);\r
 +        intent.putExtra(android.provider.Settings.EXTRA_AUTHORITIES, new String[] { AccountAuthenticator.AUTH_TOKEN_TYPE });\r
 +        startActivity(intent);  // the new activity won't be created until this.onStart() and this.onResume() are finished;\r
 +    }\r
 +\r
 +    \r
 +    /**\r
 +     *  Load of state dependent of the existence of an ownCloud account\r
 +     */\r
 +    private void initDataFromCurrentAccount() {\r
 +        /// Storage manager initialization - access to local database\r
 +        mStorageManager = new FileDataStorageManager(\r
 +                AccountUtils.getCurrentOwnCloudAccount(this),\r
 +                getContentResolver());\r
 +\r
 +        /// Check if mCurrentDir is a directory\r
 +        if(mCurrentDir != null && !mCurrentDir.isDirectory()) {\r
 +            mCurrentFile = mCurrentDir;\r
 +            mCurrentDir = mStorageManager.getFileById(mCurrentDir.getParentId());\r
 +        }\r
 +        \r
 +        /// Check if mCurrentDir and mCurrentFile are in the current account, and update them\r
 +        if (mCurrentDir != null) {\r
 +            mCurrentDir = mStorageManager.getFileByPath(mCurrentDir.getRemotePath());   // mCurrentDir == null if it is not in the current account\r
 +        }\r
 +        if (mCurrentFile != null) {\r
 +            if (mCurrentFile.fileExists()) {\r
 +                mCurrentFile = mStorageManager.getFileByPath(mCurrentFile.getRemotePath());   // mCurrentFile == null if it is not in the current account\r
 +            }   // else : keep mCurrentFile with the received value; this is currently the case of an upload in progress, when the user presses the status notification in a landscape tablet\r
 +        }\r
 +        \r
 +        /// Default to root if mCurrentDir was not found\r
 +        if (mCurrentDir == null) {\r
 +            mCurrentDir = mStorageManager.getFileByPath("/"); // will be NULL if the database was never synchronized\r
 +        }\r
 +    }\r
 +        \r
 +    \r
 +    private void initFileDetailsInDualPane() {\r
 +        if (mDualPane && getSupportFragmentManager().findFragmentByTag(FileDetailFragment.FTAG) == null) {\r
 +            FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();\r
 +            if (mCurrentFile != null) {\r
 +                if (PreviewMediaFragment.canBePreviewed(mCurrentFile)) {\r
 +                    if (mCurrentFile.isDown()) {\r
 +                        transaction.replace(R.id.file_details_container, new PreviewMediaFragment(mCurrentFile, AccountUtils.getCurrentOwnCloudAccount(this)), FileDetailFragment.FTAG);\r
 +                    } else {\r
 +                        transaction.replace(R.id.file_details_container, new FileDetailFragment(mCurrentFile, AccountUtils.getCurrentOwnCloudAccount(this)), FileDetailFragment.FTAG);\r
 +                        mWaitingToPreview = mCurrentFile;\r
 +                    }\r
 +                } else {\r
 +                    transaction.replace(R.id.file_details_container, new FileDetailFragment(mCurrentFile, AccountUtils.getCurrentOwnCloudAccount(this)), FileDetailFragment.FTAG);\r
 +                }\r
 +                mCurrentFile = null;\r
 +                \r
 +            } else {\r
 +                transaction.replace(R.id.file_details_container, new FileDetailFragment(null, null), FileDetailFragment.FTAG); // empty FileDetailFragment\r
 +            }\r
 +            transaction.commit();\r
 +        }\r
 +    }\r
 +    \r
 +    \r
 +    @Override\r
 +    public void onDestroy() {\r
 +        super.onDestroy();\r
 +        if (mDownloadConnection != null)\r
 +            unbindService(mDownloadConnection);\r
 +        if (mUploadConnection != null)\r
 +            unbindService(mUploadConnection);\r
 +    }\r
 +\r
 +    \r
 +    @Override\r
 +    public boolean onCreateOptionsMenu(Menu menu) {\r
 +        MenuInflater inflater = getSherlock().getMenuInflater();\r
 +            inflater.inflate(R.menu.main_menu, menu);\r
 +            \r
 +            patchHiddenAccents(menu);\r
 +            \r
 +            return true;\r
 +    }\r
 +\r
 +    /**\r
 +     * Workaround for this: <a href="http://code.google.com/p/android/issues/detail?id=3974">http://code.google.com/p/android/issues/detail?id=3974</a> \r
 +     * \r
 +     * @param menu      Menu to patch\r
 +     */\r
 +    private void patchHiddenAccents(Menu menu) {\r
 +        for (int i = 0; i < mMenuIdentifiersToPatch.length ; i++) {\r
 +            MenuItem aboutItem = menu.findItem(mMenuIdentifiersToPatch[i]);\r
 +            if (aboutItem != null && aboutItem.getIcon() instanceof BitmapDrawable) {\r
 +                // Clip off the bottom three (density independent) pixels of transparent padding\r
 +                Bitmap original = ((BitmapDrawable) aboutItem.getIcon()).getBitmap();\r
 +                float scale = getResources().getDisplayMetrics().density;\r
 +                int clippedHeight = (int) (original.getHeight() - (3 * scale));\r
 +                Bitmap scaled = Bitmap.createBitmap(original, 0, 0, original.getWidth(), clippedHeight);\r
 +                aboutItem.setIcon(new BitmapDrawable(getResources(), scaled));\r
 +            }\r
 +        }\r
 +    }\r
 +\r
 +\r
 +    @Override\r
 +    public boolean onOptionsItemSelected(MenuItem item) {\r
 +        boolean retval = true;\r
 +        switch (item.getItemId()) {\r
 +            case R.id.action_create_dir: {\r
 +                showDialog(DIALOG_CREATE_DIR);\r
 +                break;\r
 +            }\r
 +            case R.id.action_sync_account: {\r
 +                startSynchronization();\r
 +                break;\r
 +            }\r
 +            case R.id.action_upload: {\r
 +                showDialog(DIALOG_CHOOSE_UPLOAD_SOURCE);\r
 +                break;\r
 +            }\r
 +            case R.id.action_settings: {\r
 +                Intent settingsIntent = new Intent(this, Preferences.class);\r
 +                startActivity(settingsIntent);\r
 +                break;\r
 +            }\r
 +            case R.id.action_about_app: {\r
 +                showDialog(DIALOG_ABOUT_APP);\r
 +                break;\r
 +            }\r
 +            case android.R.id.home: {\r
 +                if(mCurrentDir != null && mCurrentDir.getParentId() != 0){\r
 +                    onBackPressed(); \r
 +                }\r
 +                break;\r
 +            }\r
 +            default:\r
 +                retval = super.onOptionsItemSelected(item);\r
 +        }\r
 +        return retval;\r
 +    }\r
 +\r
 +    private void startSynchronization() {\r
 +        ContentResolver.cancelSync(null, AccountAuthenticator.AUTH_TOKEN_TYPE);   // cancel the current synchronizations of any ownCloud account\r
 +        Bundle bundle = new Bundle();\r
 +        bundle.putBoolean(ContentResolver.SYNC_EXTRAS_MANUAL, true);\r
 +        ContentResolver.requestSync(\r
 +                AccountUtils.getCurrentOwnCloudAccount(this),\r
 +                AccountAuthenticator.AUTH_TOKEN_TYPE, bundle);\r
 +    }\r
 +\r
 +\r
 +    @Override\r
 +    public boolean onNavigationItemSelected(int itemPosition, long itemId) {\r
 +        int i = itemPosition;\r
 +        while (i-- != 0) {\r
 +            onBackPressed();\r
 +        }\r
 +        // the next operation triggers a new call to this method, but it's necessary to \r
 +        // ensure that the name exposed in the action bar is the current directory when the \r
 +        // user selected it in the navigation list\r
 +        if (itemPosition != 0)\r
 +            getSupportActionBar().setSelectedNavigationItem(0);\r
 +        return true;\r
 +    }\r
 +\r
 +    /**\r
 +     * Called, when the user selected something for uploading\r
 +     */\r
 +    public void onActivityResult(int requestCode, int resultCode, Intent data) {\r
 +        \r
 +        if (requestCode == ACTION_SELECT_CONTENT_FROM_APPS && (resultCode == RESULT_OK || resultCode == UploadFilesActivity.RESULT_OK_AND_MOVE)) {\r
 +            requestSimpleUpload(data, resultCode);\r
 +            \r
 +        } else if (requestCode == ACTION_SELECT_MULTIPLE_FILES && (resultCode == RESULT_OK || resultCode == UploadFilesActivity.RESULT_OK_AND_MOVE)) {\r
 +            requestMultipleUpload(data, resultCode);\r
 +            \r
 +        }\r
 +    }\r
 +\r
 +    private void requestMultipleUpload(Intent data, int resultCode) {\r
 +        String[] filePaths = data.getStringArrayExtra(UploadFilesActivity.EXTRA_CHOSEN_FILES);\r
 +        if (filePaths != null) {\r
 +            String[] remotePaths = new String[filePaths.length];\r
 +            String remotePathBase = "";\r
 +            for (int j = mDirectories.getCount() - 2; j >= 0; --j) {\r
 +                remotePathBase += OCFile.PATH_SEPARATOR + mDirectories.getItem(j);\r
 +            }\r
 +            if (!remotePathBase.endsWith(OCFile.PATH_SEPARATOR))\r
 +                remotePathBase += OCFile.PATH_SEPARATOR;\r
 +            for (int j = 0; j< remotePaths.length; j++) {\r
 +                remotePaths[j] = remotePathBase + (new File(filePaths[j])).getName();\r
 +            }\r
 +\r
 +            Intent i = new Intent(this, FileUploader.class);\r
 +            i.putExtra(FileUploader.KEY_ACCOUNT, AccountUtils.getCurrentOwnCloudAccount(this));\r
 +            i.putExtra(FileUploader.KEY_LOCAL_FILE, filePaths);\r
 +            i.putExtra(FileUploader.KEY_REMOTE_FILE, remotePaths);\r
 +            i.putExtra(FileUploader.KEY_UPLOAD_TYPE, FileUploader.UPLOAD_MULTIPLE_FILES);\r
 +            if (resultCode == UploadFilesActivity.RESULT_OK_AND_MOVE)\r
 +                i.putExtra(FileUploader.KEY_LOCAL_BEHAVIOUR, FileUploader.LOCAL_BEHAVIOUR_MOVE);\r
 +            startService(i);\r
 +            \r
 +        } else {\r
 +            Log.d("FileDisplay", "User clicked on 'Update' with no selection");\r
 +            Toast t = Toast.makeText(this, getString(R.string.filedisplay_no_file_selected), Toast.LENGTH_LONG);\r
 +            t.show();\r
 +            return;\r
 +        }\r
 +    }\r
 +\r
 +\r
 +    private void requestSimpleUpload(Intent data, int resultCode) {\r
 +        String filepath = null;\r
 +        try {\r
 +            Uri selectedImageUri = data.getData();\r
 +\r
 +            String filemanagerstring = selectedImageUri.getPath();\r
 +            String selectedImagePath = getPath(selectedImageUri);\r
 +\r
 +            if (selectedImagePath != null)\r
 +                filepath = selectedImagePath;\r
 +            else\r
 +                filepath = filemanagerstring;\r
 +            \r
 +        } catch (Exception e) {\r
 +            Log.e("FileDisplay", "Unexpected exception when trying to read the result of Intent.ACTION_GET_CONTENT", e);\r
 +            e.printStackTrace();\r
 +            \r
 +        } finally {\r
 +            if (filepath == null) {\r
 +                Log.e("FileDisplay", "Couldnt resolve path to file");\r
 +                Toast t = Toast.makeText(this, getString(R.string.filedisplay_unexpected_bad_get_content), Toast.LENGTH_LONG);\r
 +                t.show();\r
 +                return;\r
 +            }\r
 +        }\r
 +\r
 +        Intent i = new Intent(this, FileUploader.class);\r
 +        i.putExtra(FileUploader.KEY_ACCOUNT,\r
 +                AccountUtils.getCurrentOwnCloudAccount(this));\r
 +        String remotepath = new String();\r
 +        for (int j = mDirectories.getCount() - 2; j >= 0; --j) {\r
 +            remotepath += OCFile.PATH_SEPARATOR + mDirectories.getItem(j);\r
 +        }\r
 +        if (!remotepath.endsWith(OCFile.PATH_SEPARATOR))\r
 +            remotepath += OCFile.PATH_SEPARATOR;\r
 +        remotepath += new File(filepath).getName();\r
 +\r
 +        i.putExtra(FileUploader.KEY_LOCAL_FILE, filepath);\r
 +        i.putExtra(FileUploader.KEY_REMOTE_FILE, remotepath);\r
 +        i.putExtra(FileUploader.KEY_UPLOAD_TYPE, FileUploader.UPLOAD_SINGLE_FILE);\r
 +        if (resultCode == UploadFilesActivity.RESULT_OK_AND_MOVE)\r
 +            i.putExtra(FileUploader.KEY_LOCAL_BEHAVIOUR, FileUploader.LOCAL_BEHAVIOUR_MOVE);\r
 +        startService(i);\r
 +    }\r
 +\r
 +\r
 +    @Override\r
 +    public void onBackPressed() {\r
 +        if (mDirectories.getCount() <= 1) {\r
 +            finish();\r
 +            return;\r
 +        }\r
 +        popDirname();\r
 +        mFileList.onNavigateUp();\r
 +        mCurrentDir = mFileList.getCurrentFile();\r
 +        \r
 +        if (mDualPane) {\r
 +            // Resets the FileDetailsFragment on Tablets so that it always displays\r
 +            Fragment fileFragment = getSupportFragmentManager().findFragmentByTag(FileDetailFragment.FTAG);\r
 +            if (fileFragment != null && (fileFragment instanceof PreviewMediaFragment || !((FileDetailFragment) fileFragment).isEmpty())) {\r
 +                FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();\r
 +                transaction.replace(R.id.file_details_container, new FileDetailFragment(null, null), FileDetailFragment.FTAG); // empty FileDetailFragment                \r
 +                transaction.commit();\r
 +            }\r
 +        }\r
 +        \r
 +        if(mCurrentDir.getParentId() == 0){\r
 +            ActionBar actionBar = getSupportActionBar(); \r
 +            actionBar.setDisplayHomeAsUpEnabled(false);\r
 +        } \r
 +    }\r
 +\r
 +    @Override\r
 +    protected void onSaveInstanceState(Bundle outState) {\r
 +        // responsibility of restore is preferred in onCreate() before than in onRestoreInstanceState when there are Fragments involved\r
 +        Log.d(getClass().toString(), "onSaveInstanceState() start");\r
 +        super.onSaveInstanceState(outState);\r
 +        outState.putParcelable(FileDetailFragment.EXTRA_FILE, mCurrentDir);\r
 +        if (mDualPane) {\r
 +            FileFragment fragment = (FileFragment) getSupportFragmentManager().findFragmentByTag(FileDetailFragment.FTAG);\r
 +            if (fragment != null) {\r
 +                OCFile file = fragment.getFile();\r
 +                if (file != null) {\r
 +                    outState.putParcelable(FileDetailFragment.EXTRA_FILE, file);\r
 +                }\r
 +            }\r
 +        }\r
 +        outState.putParcelable(FileDetailActivity.KEY_WAITING_TO_PREVIEW, mWaitingToPreview);\r
 +        Log.d(getClass().toString(), "onSaveInstanceState() end");\r
 +    }\r
 +\r
 +    @Override\r
 +    public void onResume() {\r
 +        Log.d(getClass().toString(), "onResume() start");\r
 +        super.onResume();\r
 +\r
 +        if (AccountUtils.accountsAreSetup(this)) {\r
 +            \r
 +            if (mStorageManager == null) {\r
 +                // this is necessary for handling the come back to FileDisplayActivity when the first ownCloud account is created \r
 +                initDataFromCurrentAccount();\r
 +                if (mDualPane) {\r
 +                    initFileDetailsInDualPane();\r
 +                }\r
 +            }\r
 +            \r
 +            // Listen for sync messages\r
 +            IntentFilter syncIntentFilter = new IntentFilter(FileSyncService.SYNC_MESSAGE);\r
 +            mSyncBroadcastReceiver = new SyncBroadcastReceiver();\r
 +            registerReceiver(mSyncBroadcastReceiver, syncIntentFilter);\r
 +            \r
 +            // Listen for upload messages\r
 +            IntentFilter uploadIntentFilter = new IntentFilter(FileUploader.UPLOAD_FINISH_MESSAGE);\r
 +            mUploadFinishReceiver = new UploadFinishReceiver();\r
 +            registerReceiver(mUploadFinishReceiver, uploadIntentFilter);\r
 +            \r
 +            // Listen for download messages\r
 +            IntentFilter downloadIntentFilter = new IntentFilter(FileDownloader.DOWNLOAD_ADDED_MESSAGE);\r
 +            downloadIntentFilter.addAction(FileDownloader.DOWNLOAD_FINISH_MESSAGE);\r
 +            mDownloadFinishReceiver = new DownloadFinishReceiver();\r
 +            registerReceiver(mDownloadFinishReceiver, downloadIntentFilter);\r
 +        \r
 +            // List current directory\r
 +            mFileList.listDirectory(mCurrentDir);   // TODO we should find the way to avoid the need of this (maybe it's not necessary yet; to check)\r
 +            \r
 +        } else {\r
 +            \r
 +            mStorageManager = null;     // an invalid object will be there if all the ownCloud accounts are removed\r
 +            showDialog(DIALOG_SETUP_ACCOUNT);\r
 +            \r
 +        }\r
 +        Log.d(getClass().toString(), "onResume() end");\r
 +    }\r
 +\r
 +    \r
 +    @Override\r
 +    public void onPause() {\r
 +        Log.d(getClass().toString(), "onPause() start");\r
 +        super.onPause();\r
 +        if (mSyncBroadcastReceiver != null) {\r
 +            unregisterReceiver(mSyncBroadcastReceiver);\r
 +            mSyncBroadcastReceiver = null;\r
 +        }\r
 +        if (mUploadFinishReceiver != null) {\r
 +            unregisterReceiver(mUploadFinishReceiver);\r
 +            mUploadFinishReceiver = null;\r
 +        }\r
 +        if (mDownloadFinishReceiver != null) {\r
 +            unregisterReceiver(mDownloadFinishReceiver);\r
 +            mDownloadFinishReceiver = null;\r
 +        }\r
 +        if (!AccountUtils.accountsAreSetup(this)) {\r
 +            dismissDialog(DIALOG_SETUP_ACCOUNT);\r
 +        }\r
 +        \r
 +        Log.d(getClass().toString(), "onPause() end");\r
 +    }\r
 +\r
 +    \r
 +    @Override\r
 +    protected void onPrepareDialog(int id, Dialog dialog, Bundle args) {\r
 +        if (id == DIALOG_SSL_VALIDATOR && mLastSslUntrustedServerResult != null) {\r
 +            ((SslValidatorDialog)dialog).updateResult(mLastSslUntrustedServerResult);\r
 +        }\r
 +    }\r
 +\r
 +    \r
 +    @Override\r
 +    protected Dialog onCreateDialog(int id) {\r
 +        Dialog dialog = null;\r
 +        AlertDialog.Builder builder;\r
 +        switch (id) {\r
 +        case DIALOG_SETUP_ACCOUNT: {\r
 +            builder = new AlertDialog.Builder(this);\r
 +            builder.setTitle(R.string.main_tit_accsetup);\r
 +            builder.setMessage(R.string.main_wrn_accsetup);\r
 +            builder.setCancelable(false);\r
 +            builder.setPositiveButton(android.R.string.ok, new OnClickListener() {\r
 +                public void onClick(DialogInterface dialog, int which) {\r
 +                    createFirstAccount();\r
 +                    dialog.dismiss();\r
 +                }\r
 +            });\r
 +            String message = String.format(getString(R.string.common_exit), getString(R.string.app_name));\r
 +            builder.setNegativeButton(message, new OnClickListener() {\r
 +                public void onClick(DialogInterface dialog, int which) {\r
 +                    dialog.dismiss();\r
 +                    finish();\r
 +                }\r
 +            });\r
 +            //builder.setNegativeButton(android.R.string.cancel, this);\r
 +            dialog = builder.create();\r
 +            break;\r
 +        }\r
 +        case DIALOG_ABOUT_APP: {\r
 +            builder = new AlertDialog.Builder(this);\r
 +            builder.setTitle(getString(R.string.about_title));\r
 +            PackageInfo pkg;\r
 +            try {\r
 +                pkg = getPackageManager().getPackageInfo(getPackageName(), 0);\r
 +                builder.setMessage(String.format(getString(R.string.about_message), getString(R.string.app_name), pkg.versionName));\r
 +                builder.setIcon(android.R.drawable.ic_menu_info_details);\r
 +                dialog = builder.create();\r
 +            } catch (NameNotFoundException e) {\r
 +                builder = null;\r
 +                dialog = null;\r
 +                Log.e(TAG, "Error while showing about dialog", e);\r
 +            }\r
 +            break;\r
 +        }\r
 +        case DIALOG_CREATE_DIR: {\r
 +            builder = new Builder(this);\r
 +            final EditText dirNameInput = new EditText(getBaseContext());\r
 +            builder.setView(dirNameInput);\r
 +            builder.setTitle(R.string.uploader_info_dirname);\r
 +            int typed_color = getResources().getColor(R.color.setup_text_typed);\r
 +            dirNameInput.setTextColor(typed_color);\r
 +            builder.setPositiveButton(android.R.string.ok,\r
 +                    new OnClickListener() {\r
 +                        public void onClick(DialogInterface dialog, int which) {\r
 +                            String directoryName = dirNameInput.getText().toString();\r
 +                            if (directoryName.trim().length() == 0) {\r
 +                                dialog.cancel();\r
 +                                return;\r
 +                            }\r
 +    \r
 +                            // Figure out the path where the dir needs to be created\r
 +                            String path;\r
 +                            if (mCurrentDir == null) {\r
 +                                // this is just a patch; we should ensure that mCurrentDir never is null\r
 +                                if (!mStorageManager.fileExists(OCFile.PATH_SEPARATOR)) {\r
 +                                    OCFile file = new OCFile(OCFile.PATH_SEPARATOR);\r
 +                                    mStorageManager.saveFile(file);\r
 +                                }\r
 +                                mCurrentDir = mStorageManager.getFileByPath(OCFile.PATH_SEPARATOR);\r
 +                            }\r
 +                            path = FileDisplayActivity.this.mCurrentDir.getRemotePath();\r
 +                            \r
 +                            // Create directory\r
 +                            path += directoryName + OCFile.PATH_SEPARATOR;\r
 +                            Thread thread = new Thread(new DirectoryCreator(path,  AccountUtils.getCurrentOwnCloudAccount(FileDisplayActivity.this), new Handler()));\r
 +                            thread.start();\r
 +                            \r
 +                            dialog.dismiss();\r
 +                            \r
 +                            showDialog(DIALOG_SHORT_WAIT);\r
 +                        }\r
 +                    });\r
 +            builder.setNegativeButton(R.string.common_cancel,\r
 +                    new OnClickListener() {\r
 +                        public void onClick(DialogInterface dialog, int which) {\r
 +                            dialog.cancel();\r
 +                        }\r
 +                    });\r
 +            dialog = builder.create();\r
 +            break;\r
 +        }\r
 +        case DIALOG_SHORT_WAIT: {\r
 +            ProgressDialog working_dialog = new ProgressDialog(this);\r
 +            working_dialog.setMessage(getResources().getString(\r
 +                    R.string.wait_a_moment));\r
 +            working_dialog.setIndeterminate(true);\r
 +            working_dialog.setCancelable(false);\r
 +            dialog = working_dialog;\r
 +            break;\r
 +        }\r
 +        case DIALOG_CHOOSE_UPLOAD_SOURCE: {\r
-             final String [] items = {   getString(R.string.actionbar_upload_files), \r
-                                         getString(R.string.actionbar_upload_from_apps) }; \r
++            final String[] items = {    getString(R.string.actionbar_upload_files),\r
++                                        getString(R.string.actionbar_upload_from_apps), \r
++                                        getString(R.string.actionbar_failed_instant_upload) };\r
 +            builder = new AlertDialog.Builder(this);\r
 +            builder.setTitle(R.string.actionbar_upload);\r
 +            builder.setItems(items, new DialogInterface.OnClickListener() {\r
 +                public void onClick(DialogInterface dialog, int item) {\r
 +                    if (item == 0) {\r
-                         //if (!mDualPane) { \r
-                             Intent action = new Intent(FileDisplayActivity.this, UploadFilesActivity.class);\r
-                             action.putExtra(UploadFilesActivity.EXTRA_ACCOUNT, AccountUtils.getCurrentOwnCloudAccount(FileDisplayActivity.this));\r
-                             startActivityForResult(action, ACTION_SELECT_MULTIPLE_FILES);\r
-                         //} else {\r
-                             // TODO create and handle new fragment LocalFileListFragment\r
-                         //}\r
++                        // if (!mDualPane) {\r
++                        Intent action = new Intent(FileDisplayActivity.this, UploadFilesActivity.class);\r
++                        action.putExtra(UploadFilesActivity.EXTRA_ACCOUNT,\r
++                                AccountUtils.getCurrentOwnCloudAccount(FileDisplayActivity.this));\r
++                        startActivityForResult(action, ACTION_SELECT_MULTIPLE_FILES);\r
++                        // } else {\r
++                        // TODO create and handle new fragment\r
++                        // LocalFileListFragment\r
++                        // }\r
 +                    } else if (item == 1) {\r
 +                        Intent action = new Intent(Intent.ACTION_GET_CONTENT);\r
-                         action = action.setType("*/*")\r
-                                 .addCategory(Intent.CATEGORY_OPENABLE);\r
-                         startActivityForResult(\r
-                                 Intent.createChooser(action, getString(R.string.upload_chooser_title)),\r
++                        action = action.setType("*/*").addCategory(Intent.CATEGORY_OPENABLE);\r
++                        startActivityForResult(Intent.createChooser(action, getString(R.string.upload_chooser_title)),\r
 +                                ACTION_SELECT_CONTENT_FROM_APPS);\r
++                    } else if (item == 2) {\r
++                        Account account = AccountUtils.getCurrentOwnCloudAccount(FileDisplayActivity.this);\r
++                        Intent action = new Intent(FileDisplayActivity.this, InstantUploadActivity.class);\r
++                        action.putExtra(FileUploader.KEY_ACCOUNT, account);\r
++                        startActivity(action);\r
 +                    }\r
 +                }\r
 +            });\r
 +            dialog = builder.create();\r
 +            break;\r
 +        }\r
 +        case DIALOG_SSL_VALIDATOR: {\r
 +            dialog = SslValidatorDialog.newInstance(this, mLastSslUntrustedServerResult, this);\r
 +            break;\r
 +        }\r
 +        case DIALOG_CERT_NOT_SAVED: {\r
 +            builder = new AlertDialog.Builder(this);\r
 +            builder.setMessage(getResources().getString(R.string.ssl_validator_not_saved));\r
 +            builder.setCancelable(false);\r
 +            builder.setPositiveButton(R.string.common_ok, new DialogInterface.OnClickListener() {\r
 +                    @Override\r
 +                    public void onClick(DialogInterface dialog, int which) {\r
 +                        dialog.dismiss();\r
 +                    };\r
 +                });\r
 +            dialog = builder.create();\r
 +            break;\r
 +        }\r
 +        default:\r
 +            dialog = null;\r
 +        }\r
 +    \r
 +        return dialog;\r
 +    }\r
 +\r
 +    \r
 +    /**\r
 +     * Translates a content URI of an image to a physical path\r
 +     * on the disk\r
 +     * @param uri The URI to resolve\r
 +     * @return The path to the image or null if it could not be found\r
 +     */\r
 +    public String getPath(Uri uri) {\r
 +        String[] projection = { MediaStore.Images.Media.DATA };\r
 +        Cursor cursor = managedQuery(uri, projection, null, null, null);\r
 +        if (cursor != null) {\r
 +            int column_index = cursor\r
 +                    .getColumnIndexOrThrow(MediaStore.Images.Media.DATA);\r
 +            cursor.moveToFirst();\r
 +            return cursor.getString(column_index);\r
 +        } \r
 +        return null;\r
 +    }\r
 +    \r
 +    /**\r
 +     * Pushes a directory to the drop down list\r
 +     * @param directory to push\r
 +     * @throws IllegalArgumentException If the {@link OCFile#isDirectory()} returns false.\r
 +     */\r
 +    public void pushDirname(OCFile directory) {\r
 +        if(!directory.isDirectory()){\r
 +            throw new IllegalArgumentException("Only directories may be pushed!");\r
 +        }\r
 +        mDirectories.insert(directory.getFileName(), 0);\r
 +        mCurrentDir = directory;\r
 +    }\r
 +\r
 +    /**\r
 +     * Pops a directory name from the drop down list\r
 +     * @return True, unless the stack is empty\r
 +     */\r
 +    public boolean popDirname() {\r
 +        mDirectories.remove(mDirectories.getItem(0));\r
 +        return !mDirectories.isEmpty();\r
 +    }\r
 +\r
 +    private class DirectoryCreator implements Runnable {\r
 +        private String mTargetPath;\r
 +        private Account mAccount;\r
 +        private Handler mHandler; \r
 +    \r
 +        public DirectoryCreator(String targetPath, Account account, Handler handler) {\r
 +            mTargetPath = targetPath;\r
 +            mAccount = account;\r
 +            mHandler = handler;\r
 +        }\r
 +    \r
 +        @Override\r
 +        public void run() {\r
 +            WebdavClient wdc = OwnCloudClientUtils.createOwnCloudClient(mAccount, getApplicationContext());\r
 +            boolean created = wdc.createDirectory(mTargetPath);\r
 +            if (created) {\r
 +                mHandler.post(new Runnable() {\r
 +                    @Override\r
 +                    public void run() { \r
 +                        dismissDialog(DIALOG_SHORT_WAIT);\r
 +                        \r
 +                        // Save new directory in local database\r
 +                        OCFile newDir = new OCFile(mTargetPath);\r
 +                        newDir.setMimetype("DIR");\r
 +                        newDir.setParentId(mCurrentDir.getFileId());\r
 +                        mStorageManager.saveFile(newDir);\r
 +    \r
 +                        // Display the new folder right away\r
 +                        mFileList.listDirectory();\r
 +                    }\r
 +                });\r
 +                \r
 +            } else {\r
 +                mHandler.post(new Runnable() {\r
 +                    @Override\r
 +                    public void run() {\r
 +                        dismissDialog(DIALOG_SHORT_WAIT);\r
 +                        try {\r
 +                            Toast msg = Toast.makeText(FileDisplayActivity.this, R.string.create_dir_fail_msg, Toast.LENGTH_LONG); \r
 +                            msg.show();\r
 +                        \r
 +                        } catch (NotFoundException e) {\r
 +                            Log.e(TAG, "Error while trying to show fail message " , e);\r
 +                        }\r
 +                    }\r
 +                });\r
 +            }\r
 +        }\r
 +    \r
 +    }\r
 +\r
 +    // Custom array adapter to override text colors\r
 +    private class CustomArrayAdapter<T> extends ArrayAdapter<T> {\r
 +    \r
 +        public CustomArrayAdapter(FileDisplayActivity ctx, int view) {\r
 +            super(ctx, view);\r
 +        }\r
 +    \r
 +        public View getView(int position, View convertView, ViewGroup parent) {\r
 +            View v = super.getView(position, convertView, parent);\r
 +    \r
 +            ((TextView) v).setTextColor(getResources().getColorStateList(\r
 +                    android.R.color.white));\r
 +            return v;\r
 +        }\r
 +    \r
 +        public View getDropDownView(int position, View convertView,\r
 +                ViewGroup parent) {\r
 +            View v = super.getDropDownView(position, convertView, parent);\r
 +    \r
 +            ((TextView) v).setTextColor(getResources().getColorStateList(\r
 +                    android.R.color.white));\r
 +    \r
 +            return v;\r
 +        }\r
 +    \r
 +    }\r
 +\r
 +    private class SyncBroadcastReceiver extends BroadcastReceiver {\r
 +\r
 +        /**\r
 +         * {@link BroadcastReceiver} to enable syncing feedback in UI\r
 +         */\r
 +        @Override\r
 +        public void onReceive(Context context, Intent intent) {\r
 +            boolean inProgress = intent.getBooleanExtra(\r
 +                    FileSyncService.IN_PROGRESS, false);\r
 +            String accountName = intent\r
 +                    .getStringExtra(FileSyncService.ACCOUNT_NAME);\r
 +\r
 +            Log.d("FileDisplay", "sync of account " + accountName\r
 +                    + " is in_progress: " + inProgress);\r
 +\r
 +            if (accountName.equals(AccountUtils.getCurrentOwnCloudAccount(context).name)) {  \r
 +            \r
 +                String synchFolderRemotePath = intent.getStringExtra(FileSyncService.SYNC_FOLDER_REMOTE_PATH); \r
 +                 \r
 +                boolean fillBlankRoot = false;\r
 +                if (mCurrentDir == null) {\r
 +                    mCurrentDir = mStorageManager.getFileByPath("/");\r
 +                    fillBlankRoot = (mCurrentDir != null);\r
 +                }\r
 +\r
 +                if ((synchFolderRemotePath != null && mCurrentDir != null && (mCurrentDir.getRemotePath().equals(synchFolderRemotePath)))\r
 +                        || fillBlankRoot ) {\r
 +                    if (!fillBlankRoot) \r
 +                        mCurrentDir = getStorageManager().getFileByPath(synchFolderRemotePath);\r
 +                    OCFileListFragment fileListFragment = (OCFileListFragment) getSupportFragmentManager()\r
 +                            .findFragmentById(R.id.fileList);\r
 +                    if (fileListFragment != null) {\r
 +                        fileListFragment.listDirectory(mCurrentDir);\r
 +                    }\r
 +                }\r
 +                \r
 +                setSupportProgressBarIndeterminateVisibility(inProgress);\r
 +                removeStickyBroadcast(intent);\r
 +                \r
 +            }\r
 +            \r
 +            RemoteOperationResult synchResult = (RemoteOperationResult)intent.getSerializableExtra(FileSyncService.SYNC_RESULT);\r
 +            if (synchResult != null) {\r
 +                if (synchResult.getCode().equals(RemoteOperationResult.ResultCode.SSL_RECOVERABLE_PEER_UNVERIFIED)) {\r
 +                    mLastSslUntrustedServerResult = synchResult;\r
 +                    showDialog(DIALOG_SSL_VALIDATOR); \r
 +                }\r
 +            }\r
 +        }\r
 +    }\r
 +    \r
 +\r
 +    private class UploadFinishReceiver extends BroadcastReceiver {\r
 +        /**\r
 +         * Once the file upload has finished -> update view\r
 +         *  @author David A. Velasco\r
 +         * {@link BroadcastReceiver} to enable upload feedback in UI\r
 +         */\r
 +        @Override\r
 +        public void onReceive(Context context, Intent intent) {\r
 +            String uploadedRemotePath = intent.getStringExtra(FileDownloader.EXTRA_REMOTE_PATH);\r
 +            String accountName = intent.getStringExtra(FileUploader.ACCOUNT_NAME);\r
 +            boolean sameAccount = accountName.equals(AccountUtils.getCurrentOwnCloudAccount(context).name);\r
 +            boolean isDescendant = (mCurrentDir != null) && (uploadedRemotePath != null) && (uploadedRemotePath.startsWith(mCurrentDir.getRemotePath()));\r
 +            if (sameAccount && isDescendant) {\r
 +                OCFileListFragment fileListFragment = (OCFileListFragment) getSupportFragmentManager().findFragmentById(R.id.fileList);\r
 +                if (fileListFragment != null) { \r
 +                    fileListFragment.listDirectory();\r
 +                }\r
 +            }\r
 +        }\r
 +        \r
 +    }\r
 +    \r
 +    \r
 +    /**\r
 +     * Class waiting for broadcast events from the {@link FielDownloader} service.\r
 +     * \r
 +     * Updates the UI when a download is started or finished, provided that it is relevant for the\r
 +     * current folder.\r
 +     */\r
 +    private class DownloadFinishReceiver extends BroadcastReceiver {\r
 +        @Override\r
 +        public void onReceive(Context context, Intent intent) {\r
 +            boolean sameAccount = isSameAccount(context, intent);\r
 +            String downloadedRemotePath = intent.getStringExtra(FileDownloader.EXTRA_REMOTE_PATH);\r
 +            boolean isDescendant = isDescendant(downloadedRemotePath);\r
 +            \r
 +            if (sameAccount && isDescendant) {\r
 +                updateLeftPanel();\r
 +                if (mDualPane) {\r
 +                    updateRightPanel(intent.getAction(), downloadedRemotePath, intent.getBooleanExtra(FileDownloader.EXTRA_DOWNLOAD_RESULT, false));\r
 +                }\r
 +            }\r
 +            \r
 +            removeStickyBroadcast(intent);\r
 +        }\r
 +\r
 +        private boolean isDescendant(String downloadedRemotePath) {\r
 +            return (mCurrentDir != null && downloadedRemotePath != null && downloadedRemotePath.startsWith(mCurrentDir.getRemotePath()));\r
 +        }\r
 +\r
 +        private boolean isSameAccount(Context context, Intent intent) {\r
 +            String accountName = intent.getStringExtra(FileDownloader.ACCOUNT_NAME);\r
 +            return (accountName != null && accountName.equals(AccountUtils.getCurrentOwnCloudAccount(context).name));\r
 +        }\r
 +    }\r
 +    \r
 +    \r
 +    protected void updateLeftPanel() {\r
 +        OCFileListFragment fileListFragment = (OCFileListFragment) getSupportFragmentManager().findFragmentById(R.id.fileList);\r
 +        if (fileListFragment != null) { \r
 +            fileListFragment.listDirectory();\r
 +        }\r
 +    }\r
 +\r
 +    protected void updateRightPanel(String downloadEvent, String downloadedRemotePath, boolean success) {\r
 +        Fragment fragment = getSupportFragmentManager().findFragmentByTag(FileDetailFragment.FTAG);\r
 +        boolean waitedPreview = (mWaitingToPreview != null && mWaitingToPreview.getRemotePath().equals(downloadedRemotePath));\r
 +        if (fragment != null && fragment instanceof FileDetailFragment) {\r
 +            FileDetailFragment detailsFragment = (FileDetailFragment) fragment;\r
 +            OCFile fileInFragment = detailsFragment.getFile();\r
 +            if (fileInFragment != null && !downloadedRemotePath.equals(fileInFragment.getRemotePath())) {\r
 +                // the user browsed to other file ; forget the automatic preview \r
 +                mWaitingToPreview = null;\r
 +                \r
 +            } else if (downloadEvent.equals(FileDownloader.DOWNLOAD_ADDED_MESSAGE)) {\r
 +                // grant that the right panel updates the progress bar\r
 +                detailsFragment.listenForTransferProgress();\r
 +                detailsFragment.updateFileDetails(true, false);\r
 +                \r
 +            } else if (downloadEvent.equals(FileDownloader.DOWNLOAD_FINISH_MESSAGE)) {\r
 +                //  update the right panel \r
 +                if (success && waitedPreview) {\r
 +                    mWaitingToPreview = mStorageManager.getFileById(mWaitingToPreview.getFileId());   // update the file from database, for the local storage path\r
 +                    FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();\r
 +                    transaction.replace(R.id.file_details_container, new PreviewMediaFragment(mWaitingToPreview, AccountUtils.getCurrentOwnCloudAccount(this)), FileDetailFragment.FTAG);\r
 +                    transaction.commit();\r
 +                    mWaitingToPreview = null;\r
 +                    \r
 +                } else {\r
 +                    detailsFragment.updateFileDetails(false, (success));\r
 +                }\r
 +            }\r
 +        }\r
 +    }\r
 +\r
 +\r
 +    /**\r
 +     * {@inheritDoc}\r
 +     */\r
 +    @Override\r
 +    public DataStorageManager getStorageManager() {\r
 +        return mStorageManager;\r
 +    }\r
 +    \r
 +\r
 +    /**\r
 +     * {@inheritDoc}\r
 +     */\r
 +    @Override\r
 +    public void onDirectoryClick(OCFile directory) {\r
 +        pushDirname(directory);\r
 +        ActionBar actionBar = getSupportActionBar();\r
 +        actionBar.setDisplayHomeAsUpEnabled(true);\r
 +        \r
 +        if (mDualPane) {\r
 +            // Resets the FileDetailsFragment on Tablets so that it always displays\r
 +            Fragment fileFragment = getSupportFragmentManager().findFragmentByTag(FileDetailFragment.FTAG);\r
 +            if (fileFragment != null && (fileFragment instanceof PreviewMediaFragment || !((FileDetailFragment) fileFragment).isEmpty())) {\r
 +                FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();\r
 +                transaction.replace(R.id.file_details_container, new FileDetailFragment(null, null), FileDetailFragment.FTAG); // empty FileDetailFragment                \r
 +                transaction.commit();\r
 +            }\r
 +        }\r
 +    }\r
 +    \r
 +    \r
 +    /**\r
 +     * {@inheritDoc}\r
 +     */\r
 +    @Override\r
 +    public void onFileClick(OCFile file) {\r
 +        if (file != null && PreviewImageFragment.canBePreviewed(file)) {\r
 +            // preview image - it handles the download, if needed\r
 +            startPreviewImage(file);\r
 +            \r
 +        } else if (file != null && PreviewMediaFragment.canBePreviewed(file)) {\r
 +            if (file.isDown()) {\r
 +                // general preview\r
 +                startMediaPreview(file);\r
 +                \r
 +            } else {\r
 +                // automatic download, preview on finish\r
 +                startDownloadForPreview(file);\r
 +                \r
 +            }\r
 +        } else {\r
 +            // details view\r
 +            startDetails(file);\r
 +        }\r
 +    }\r
 +\r
 +    private void startPreviewImage(OCFile file) {\r
 +        Intent showDetailsIntent = new Intent(this, PreviewImageActivity.class);\r
 +        showDetailsIntent.putExtra(FileDetailFragment.EXTRA_FILE, file);\r
 +        showDetailsIntent.putExtra(FileDetailFragment.EXTRA_ACCOUNT, AccountUtils.getCurrentOwnCloudAccount(this));\r
 +        startActivity(showDetailsIntent);\r
 +    }\r
 +    \r
 +    private void startMediaPreview(OCFile file) {\r
 +        if (mDualPane) {\r
 +            FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();\r
 +            transaction.replace(R.id.file_details_container, new PreviewMediaFragment(file, AccountUtils.getCurrentOwnCloudAccount(this)), FileDetailFragment.FTAG);\r
 +            transaction.commit();\r
 +            \r
 +        } else {\r
 +            Intent showDetailsIntent = new Intent(this, FileDetailActivity.class);\r
 +            showDetailsIntent.putExtra(FileDetailFragment.EXTRA_FILE, file);\r
 +            showDetailsIntent.putExtra(FileDetailFragment.EXTRA_ACCOUNT, AccountUtils.getCurrentOwnCloudAccount(this));\r
 +            startActivity(showDetailsIntent);\r
 +        }\r
 +    }\r
 +    \r
 +    private void startDownloadForPreview(OCFile file) {\r
 +        if (mDualPane) {\r
 +            FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();\r
 +            transaction.replace(R.id.file_details_container, new FileDetailFragment(file, AccountUtils.getCurrentOwnCloudAccount(this)), FileDetailFragment.FTAG);\r
 +            transaction.commit();\r
 +            mWaitingToPreview = file;\r
 +            requestForDownload();\r
 +            \r
 +        } else {\r
 +            Intent showDetailsIntent = new Intent(this, FileDetailActivity.class);\r
 +            showDetailsIntent.putExtra(FileDetailFragment.EXTRA_FILE, file);\r
 +            showDetailsIntent.putExtra(FileDetailFragment.EXTRA_ACCOUNT, AccountUtils.getCurrentOwnCloudAccount(this));\r
 +            startActivity(showDetailsIntent);\r
 +        }\r
 +    }\r
 +\r
 +    \r
 +    private void startDetails(OCFile file) {\r
 +        if (mDualPane && !file.isImage()) {\r
 +            FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();\r
 +            transaction.replace(R.id.file_details_container, new FileDetailFragment(file, AccountUtils.getCurrentOwnCloudAccount(this)), FileDetailFragment.FTAG);\r
 +            transaction.commit();\r
 +        } else {\r
 +            Intent showDetailsIntent = new Intent(this, FileDetailActivity.class);\r
 +            showDetailsIntent.putExtra(FileDetailFragment.EXTRA_FILE, file);\r
 +            showDetailsIntent.putExtra(FileDetailFragment.EXTRA_ACCOUNT, AccountUtils.getCurrentOwnCloudAccount(this));\r
 +            startActivity(showDetailsIntent);\r
 +        }\r
 +    }\r
 +\r
 +\r
 +    /**\r
 +     * {@inheritDoc}\r
 +     */\r
 +    @Override\r
 +    public OCFile getInitialDirectory() {\r
 +        return mCurrentDir;\r
 +    }\r
 +    \r
 +    \r
 +    /**\r
 +     * {@inheritDoc}\r
 +     */\r
 +    @Override\r
 +    public void onFileStateChanged() {\r
 +        OCFileListFragment fileListFragment = (OCFileListFragment) getSupportFragmentManager().findFragmentById(R.id.fileList);\r
 +        if (fileListFragment != null) { \r
 +            fileListFragment.listDirectory();\r
 +        }\r
 +    }\r
 +\r
 +    \r
 +    /**\r
 +     * {@inheritDoc}\r
 +     */\r
 +    @Override\r
 +    public FileDownloaderBinder getFileDownloaderBinder() {\r
 +        return mDownloaderBinder;\r
 +    }\r
 +\r
 +    \r
 +    /**\r
 +     * {@inheritDoc}\r
 +     */\r
 +    @Override\r
 +    public FileUploaderBinder getFileUploaderBinder() {\r
 +        return mUploaderBinder;\r
 +    }\r
 +    \r
 +    \r
 +    /** Defines callbacks for service binding, passed to bindService() */\r
 +    private class ListServiceConnection implements ServiceConnection {\r
 +\r
 +        @Override\r
 +        public void onServiceConnected(ComponentName component, IBinder service) {\r
 +            if (component.equals(new ComponentName(FileDisplayActivity.this, FileDownloader.class))) {\r
 +                Log.d(TAG, "Download service connected");\r
 +                mDownloaderBinder = (FileDownloaderBinder) service;\r
 +                if (mWaitingToPreview != null) {\r
 +                    requestForDownload();\r
 +                }\r
 +                \r
 +            } else if (component.equals(new ComponentName(FileDisplayActivity.this, FileUploader.class))) {\r
 +                Log.d(TAG, "Upload service connected");\r
 +                mUploaderBinder = (FileUploaderBinder) service;\r
 +            } else {\r
 +                return;\r
 +            }\r
 +            // a new chance to get the mDownloadBinder through getFileDownloadBinder() - THIS IS A MESS\r
 +            if (mFileList != null)\r
 +                mFileList.listDirectory();\r
 +            if (mDualPane) {\r
 +                Fragment fragment = getSupportFragmentManager().findFragmentByTag(FileDetailFragment.FTAG);\r
 +                if (fragment != null && fragment instanceof FileDetailFragment) {\r
 +                    FileDetailFragment detailFragment = (FileDetailFragment)fragment;\r
 +                    detailFragment.listenForTransferProgress();\r
 +                    detailFragment.updateFileDetails(false, false);\r
 +                }\r
 +            }\r
 +        }\r
 +\r
 +        @Override\r
 +        public void onServiceDisconnected(ComponentName component) {\r
 +            if (component.equals(new ComponentName(FileDisplayActivity.this, FileDownloader.class))) {\r
 +                Log.d(TAG, "Download service disconnected");\r
 +                mDownloaderBinder = null;\r
 +            } else if (component.equals(new ComponentName(FileDisplayActivity.this, FileUploader.class))) {\r
 +                Log.d(TAG, "Upload service disconnected");\r
 +                mUploaderBinder = null;\r
 +            }\r
 +        }\r
 +    };    \r
 +\r
 +    \r
 +    \r
 +    /**\r
 +     * Launch an intent to request the PIN code to the user before letting him use the app\r
 +     */\r
 +    private void requestPinCode() {\r
 +        boolean pinStart = false;\r
 +        SharedPreferences appPrefs = PreferenceManager.getDefaultSharedPreferences(getApplicationContext());\r
 +        pinStart = appPrefs.getBoolean("set_pincode", false);\r
 +        if (pinStart) {\r
 +            Intent i = new Intent(getApplicationContext(), PinCodeActivity.class);\r
 +            i.putExtra(PinCodeActivity.EXTRA_ACTIVITY, "FileDisplayActivity");\r
 +            startActivity(i);\r
 +        }\r
 +    }\r
 +\r
 +\r
 +    @Override\r
 +    public void onSavedCertificate() {\r
 +        startSynchronization();                \r
 +    }\r
 +\r
 +\r
 +    @Override\r
 +    public void onFailedSavingCertificate() {\r
 +        showDialog(DIALOG_CERT_NOT_SAVED);\r
 +    }\r
 +\r
 +\r
 +    /**\r
 +     * Updates the view associated to the activity after the finish of some operation over files\r
 +     * in the current account.\r
 +     * \r
 +     * @param operation     Removal operation performed.\r
 +     * @param result        Result of the removal.\r
 +     */\r
 +    @Override\r
 +    public void onRemoteOperationFinish(RemoteOperation operation, RemoteOperationResult result) {\r
 +        if (operation instanceof RemoveFileOperation) {\r
 +            onRemoveFileOperationFinish((RemoveFileOperation)operation, result);\r
 +                \r
 +        } else if (operation instanceof RenameFileOperation) {\r
 +            onRenameFileOperationFinish((RenameFileOperation)operation, result);\r
 +            \r
 +        } else if (operation instanceof SynchronizeFileOperation) {\r
 +            onSynchronizeFileOperationFinish((SynchronizeFileOperation)operation, result);\r
 +        }\r
 +    }\r
 +\r
 +\r
 +    /**\r
 +     * Updates the view associated to the activity after the finish of an operation trying to remove a \r
 +     * file. \r
 +     * \r
 +     * @param operation     Removal operation performed.\r
 +     * @param result        Result of the removal.\r
 +     */\r
 +    private void onRemoveFileOperationFinish(RemoveFileOperation operation, RemoteOperationResult result) {\r
 +        dismissDialog(DIALOG_SHORT_WAIT);\r
 +        if (result.isSuccess()) {\r
 +            Toast msg = Toast.makeText(this, R.string.remove_success_msg, Toast.LENGTH_LONG);\r
 +            msg.show();\r
 +            OCFile removedFile = operation.getFile();\r
 +            if (mDualPane) {\r
 +                FileFragment details = (FileFragment) getSupportFragmentManager().findFragmentByTag(FileDetailFragment.FTAG);\r
 +                if (details != null && removedFile.equals(details.getFile())) {\r
 +                    FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();\r
 +                    transaction.replace(R.id.file_details_container, new FileDetailFragment(null, null)); // empty FileDetailFragment\r
 +                    transaction.commit();\r
 +                }\r
 +            }\r
 +            if (mStorageManager.getFileById(removedFile.getParentId()).equals(mCurrentDir)) {\r
 +                mFileList.listDirectory();\r
 +            }\r
 +                \r
 +        } else {\r
 +            Toast msg = Toast.makeText(this, R.string.remove_fail_msg, Toast.LENGTH_LONG); \r
 +            msg.show();\r
 +            if (result.isSslRecoverableException()) {\r
 +                mLastSslUntrustedServerResult = result;\r
 +                showDialog(DIALOG_SSL_VALIDATOR); \r
 +            }\r
 +        }\r
 +    }\r
 +\r
 +    /**\r
 +     * Updates the view associated to the activity after the finish of an operation trying to rename a \r
 +     * file. \r
 +     * \r
 +     * @param operation     Renaming operation performed.\r
 +     * @param result        Result of the renaming.\r
 +     */\r
 +    private void onRenameFileOperationFinish(RenameFileOperation operation, RemoteOperationResult result) {\r
 +        dismissDialog(DIALOG_SHORT_WAIT);\r
 +        OCFile renamedFile = operation.getFile();\r
 +        if (result.isSuccess()) {\r
 +            if (mDualPane) {\r
 +                FileFragment details = (FileFragment) getSupportFragmentManager().findFragmentByTag(FileDetailFragment.FTAG);\r
 +                if (details != null && details instanceof FileDetailFragment && renamedFile.equals(details.getFile()) ) {\r
 +                    ((FileDetailFragment) details).updateFileDetails(renamedFile, AccountUtils.getCurrentOwnCloudAccount(this));\r
 +                }\r
 +            }\r
 +            if (mStorageManager.getFileById(renamedFile.getParentId()).equals(mCurrentDir)) {\r
 +                mFileList.listDirectory();\r
 +            }\r
 +            \r
 +        } else {\r
 +            if (result.getCode().equals(ResultCode.INVALID_LOCAL_FILE_NAME)) {\r
 +                Toast msg = Toast.makeText(this, R.string.rename_local_fail_msg, Toast.LENGTH_LONG); \r
 +                msg.show();\r
 +                // TODO throw again the new rename dialog\r
 +            } else {\r
 +                Toast msg = Toast.makeText(this, R.string.rename_server_fail_msg, Toast.LENGTH_LONG); \r
 +                msg.show();\r
 +                if (result.isSslRecoverableException()) {\r
 +                    mLastSslUntrustedServerResult = result;\r
 +                    showDialog(DIALOG_SSL_VALIDATOR); \r
 +                }\r
 +            }\r
 +        }\r
 +    }\r
 +\r
 +\r
 +    private void onSynchronizeFileOperationFinish(SynchronizeFileOperation operation, RemoteOperationResult result) {\r
 +        dismissDialog(DIALOG_SHORT_WAIT);\r
 +        OCFile syncedFile = operation.getLocalFile();\r
 +        if (!result.isSuccess()) {\r
 +            if (result.getCode() == ResultCode.SYNC_CONFLICT) {\r
 +                Intent i = new Intent(this, ConflictsResolveActivity.class);\r
 +                i.putExtra(ConflictsResolveActivity.EXTRA_FILE, syncedFile);\r
 +                i.putExtra(ConflictsResolveActivity.EXTRA_ACCOUNT, AccountUtils.getCurrentOwnCloudAccount(this));\r
 +                startActivity(i);\r
 +                \r
 +            } else {\r
 +                Toast msg = Toast.makeText(this, R.string.sync_file_fail_msg, Toast.LENGTH_LONG); \r
 +                msg.show();\r
 +            }\r
 +            \r
 +        } else {\r
 +            if (operation.transferWasRequested()) {\r
 +                mFileList.listDirectory();\r
 +                onTransferStateChanged(syncedFile, true, true);\r
 +                \r
 +            } else {\r
 +                Toast msg = Toast.makeText(this, R.string.sync_file_nothing_to_do_msg, Toast.LENGTH_LONG); \r
 +                msg.show();\r
 +            }\r
 +        }\r
 +    }\r
 +\r
 +\r
 +    /**\r
 +     * {@inheritDoc}\r
 +     */\r
 +    @Override\r
 +    public void onTransferStateChanged(OCFile file, boolean downloading, boolean uploading) {\r
 +        /*OCFileListFragment fileListFragment = (OCFileListFragment) getSupportFragmentManager().findFragmentById(R.id.fileList);\r
 +        if (fileListFragment != null) { \r
 +            fileListFragment.listDirectory();\r
 +        }*/\r
 +        if (mDualPane) {\r
 +            FileFragment details = (FileFragment) getSupportFragmentManager().findFragmentByTag(FileDetailFragment.FTAG);\r
 +            if (details != null && details instanceof FileDetailFragment && file.equals(details.getFile()) ) {\r
 +                if (downloading || uploading) {\r
 +                    ((FileDetailFragment)details).updateFileDetails(file, AccountUtils.getCurrentOwnCloudAccount(this));\r
 +                } else {\r
 +                    ((FileDetailFragment)details).updateFileDetails(false, true);\r
 +                }\r
 +            }\r
 +        }\r
 +    }\r
 +\r
 +\r
 +    @Override\r
 +    public void showFragmentWithDetails(OCFile file) {\r
 +        if (mDualPane) {\r
 +            FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();\r
 +            transaction.replace(R.id.file_details_container, new FileDetailFragment(file, AccountUtils.getCurrentOwnCloudAccount(this)), FileDetailFragment.FTAG); \r
 +            transaction.commit();\r
 +            \r
 +        } else {\r
 +            Intent showDetailsIntent = new Intent(this, FileDetailActivity.class);\r
 +            showDetailsIntent.putExtra(FileDetailFragment.EXTRA_FILE, file);\r
 +            showDetailsIntent.putExtra(FileDetailFragment.EXTRA_ACCOUNT, AccountUtils.getCurrentOwnCloudAccount(this));\r
 +            showDetailsIntent.putExtra(FileDetailActivity.EXTRA_MODE, FileDetailActivity.MODE_DETAILS);\r
 +            startActivity(showDetailsIntent);\r
 +        }\r
 +    }\r
 +\r
 +\r
 +    private void requestForDownload() {\r
 +        Account account = AccountUtils.getCurrentOwnCloudAccount(this);\r
 +        if (!mDownloaderBinder.isDownloading(account, mWaitingToPreview)) {\r
 +            Intent i = new Intent(this, FileDownloader.class);\r
 +            i.putExtra(FileDownloader.EXTRA_ACCOUNT, account);\r
 +            i.putExtra(FileDownloader.EXTRA_FILE, mWaitingToPreview);\r
 +            startService(i);\r
 +        }\r
 +    }\r
 +\r
 +    \r
 +}\r
 -package com.owncloud.android.ui.activity;
 -
 -import java.io.File;
 -
 -import android.accounts.Account;
 -import android.app.AlertDialog;
 -import android.app.AlertDialog.Builder;
 -import android.app.Dialog;
 -import android.app.ProgressDialog;
 -import android.content.BroadcastReceiver;
 -import android.content.ComponentName;
 -import android.content.ContentResolver;
 -import android.content.Context;
 -import android.content.DialogInterface;
 -import android.content.DialogInterface.OnClickListener;
 -import android.content.Intent;
 -import android.content.IntentFilter;
 -import android.content.ServiceConnection;
 -import android.content.SharedPreferences;
 -import android.content.SharedPreferences.Editor;
 -import android.content.pm.PackageInfo;
 -import android.content.pm.PackageManager.NameNotFoundException;
 -import android.content.res.Resources.NotFoundException;
 -import android.database.Cursor;
 -import android.graphics.Bitmap;
 -import android.graphics.drawable.BitmapDrawable;
 -import android.net.Uri;
 -import android.os.Bundle;
 -import android.os.Handler;
 -import android.os.IBinder;
 -import android.preference.PreferenceManager;
 -import android.provider.MediaStore;
 -import android.support.v4.app.FragmentTransaction;
 -import android.util.Log;
 -import android.view.View;
 -import android.view.ViewGroup;
 -import android.widget.ArrayAdapter;
 -import android.widget.EditText;
 -import android.widget.TextView;
 -import android.widget.Toast;
 -
 -import com.actionbarsherlock.app.ActionBar;
 -import com.actionbarsherlock.app.ActionBar.OnNavigationListener;
 -import com.actionbarsherlock.app.SherlockFragmentActivity;
 -import com.actionbarsherlock.view.Menu;
 -import com.actionbarsherlock.view.MenuInflater;
 -import com.actionbarsherlock.view.MenuItem;
 -import com.actionbarsherlock.view.Window;
 -import com.owncloud.android.AccountUtils;
 -import com.owncloud.android.R;
 -import com.owncloud.android.authenticator.AccountAuthenticator;
 -import com.owncloud.android.datamodel.DataStorageManager;
 -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;
 -import com.owncloud.android.files.services.FileObserverService;
 -import com.owncloud.android.files.services.FileUploader;
 -import com.owncloud.android.files.services.FileUploader.FileUploaderBinder;
 -import com.owncloud.android.network.OwnCloudClientUtils;
 -import com.owncloud.android.operations.OnRemoteOperationListener;
 -import com.owncloud.android.operations.RemoteOperation;
 -import com.owncloud.android.operations.RemoteOperationResult;
 -import com.owncloud.android.operations.RemoteOperationResult.ResultCode;
 -import com.owncloud.android.operations.RemoveFileOperation;
 -import com.owncloud.android.operations.RenameFileOperation;
 -import com.owncloud.android.operations.SynchronizeFileOperation;
 -import com.owncloud.android.syncadapter.FileSyncService;
 -import com.owncloud.android.ui.dialog.ChangelogDialog;
 -import com.owncloud.android.ui.dialog.SslValidatorDialog;
 -import com.owncloud.android.ui.dialog.SslValidatorDialog.OnSslValidatorListener;
 -import com.owncloud.android.ui.fragment.FileDetailFragment;
 -import com.owncloud.android.ui.fragment.OCFileListFragment;
 -
 -import eu.alefzero.webdav.WebdavClient;
 -
 -/**
 - * Displays, what files the user has available in his ownCloud.
 - * 
 - * @author Bartek Przybylski
 - * 
 - */
 -
 -public class FileDisplayActivity extends SherlockFragmentActivity implements OCFileListFragment.ContainerActivity,
 -        FileDetailFragment.ContainerActivity, OnNavigationListener, OnSslValidatorListener, OnRemoteOperationListener {
 -
 -    private ArrayAdapter<String> mDirectories;
 -    private OCFile mCurrentDir = null;
 -    private OCFile mCurrentFile = null;
 -
 -    private DataStorageManager mStorageManager;
 -    private SyncBroadcastReceiver mSyncBroadcastReceiver;
 -    private UploadFinishReceiver mUploadFinishReceiver;
 -    private DownloadFinishReceiver mDownloadFinishReceiver;
 -    private FileDownloaderBinder mDownloaderBinder = null;
 -    private FileUploaderBinder mUploaderBinder = null;
 -    private ServiceConnection mDownloadConnection = null, mUploadConnection = null;
 -    private RemoteOperationResult mLastSslUntrustedServerResult = null;
 -    
 -    private OCFileListFragment mFileList;
 -    
 -    private boolean mDualPane;
 -    
 -    private static final int DIALOG_SETUP_ACCOUNT = 0;
 -    private static final int DIALOG_CREATE_DIR = 1;
 -    private static final int DIALOG_ABOUT_APP = 2;
 -    public static final int DIALOG_SHORT_WAIT = 3;
 -    private static final int DIALOG_CHOOSE_UPLOAD_SOURCE = 4;
 -    private static final int DIALOG_SSL_VALIDATOR = 5;
 -    private static final int DIALOG_CERT_NOT_SAVED = 6;
 -    private static final String DIALOG_CHANGELOG_TAG = "DIALOG_CHANGELOG";
 -
 -    
 -    private static final int ACTION_SELECT_CONTENT_FROM_APPS = 1;
 -    private static final int ACTION_SELECT_MULTIPLE_FILES = 2;
 -    private static final int ACTION_SELECT_FAILED_INSTANT_UPLOAD = 2;
 -
 -    private static final String TAG = "FileDisplayActivity";
 -
 -    private static int[] mMenuIdentifiersToPatch = {R.id.about_app};
 -    
 -    @Override
 -    public void onCreate(Bundle savedInstanceState) {
 -        Log.d(getClass().toString(), "onCreate() start");
 -        super.onCreate(savedInstanceState);
 -
 -        /// Load of parameters from received intent
 -        mCurrentDir = getIntent().getParcelableExtra(FileDetailFragment.EXTRA_FILE); // no check necessary, mCurrenDir == null if the parameter is not in the intent
 -        Account account = getIntent().getParcelableExtra(FileDetailFragment.EXTRA_ACCOUNT);
 -        if (account != null)
 -            AccountUtils.setCurrentOwnCloudAccount(this, account.name);
 -        
 -        /// Load of saved instance state: keep this always before initDataFromCurrentAccount()
 -        if(savedInstanceState != null) {
 -            // TODO - test if savedInstanceState should take precedence over file in the intent ALWAYS (now), NEVER, or SOME TIMES
 -            mCurrentDir = savedInstanceState.getParcelable(FileDetailFragment.EXTRA_FILE);
 -        }
 -        
 -        if (!AccountUtils.accountsAreSetup(this)) {
 -            /// no account available: FORCE ACCOUNT CREATION
 -            mStorageManager = null;
 -            createFirstAccount();
 -
 -        } else { // / at least an account is available
 -
 -            initDataFromCurrentAccount(); // it checks mCurrentDir and
 -                                          // mCurrentFile with the current
 -                                          // account
 -
 -        }
 -        
 -        mUploadConnection = new ListServiceConnection(); 
 -        mDownloadConnection = new ListServiceConnection();
 -        bindService(new Intent(this, FileUploader.class), mUploadConnection, Context.BIND_AUTO_CREATE);
 -        bindService(new Intent(this, FileDownloader.class), mDownloadConnection, Context.BIND_AUTO_CREATE);
 -
 -        // 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();
 -        }
 -
 -        // file observer
 -        Intent observer_intent = new Intent(this, FileObserverService.class);
 -        observer_intent.putExtra(FileObserverService.KEY_FILE_CMD, FileObserverService.CMD_INIT_OBSERVED_LIST);
 -        startService(observer_intent);
 -        
 -            
 -        /// USER INTERFACE
 -        requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);
 -            
 -        // Drop-down navigation 
 -        mDirectories = new CustomArrayAdapter<String>(this, R.layout.sherlock_spinner_dropdown_item);
 -        OCFile currFile = mCurrentDir;
 -        while (currFile != null && currFile.getFileName() != OCFile.PATH_SEPARATOR) {
 -            mDirectories.add(currFile.getFileName());
 -            currFile = mStorageManager.getFileById(currFile.getParentId());
 -        }
 -        mDirectories.add(OCFile.PATH_SEPARATOR);
 -
 -        // Inflate and set the layout view
 -        setContentView(R.layout.files);    
 -        mFileList = (OCFileListFragment) getSupportFragmentManager().findFragmentById(R.id.fileList);
 -        mDualPane = (findViewById(R.id.file_details_container) != null);
 -        if (mDualPane) {
 -            initFileDetailsInDualPane();
 -        }
 -            
 -        // Action bar setup
 -        ActionBar actionBar = getSupportActionBar();
 -        actionBar.setHomeButtonEnabled(true);   // mandatory since Android ICS, according to the official documentation
 -        actionBar.setDisplayHomeAsUpEnabled(mCurrentDir != null && mCurrentDir.getParentId() != 0);
 -        actionBar.setDisplayShowTitleEnabled(false);
 -        actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_LIST);
 -        actionBar.setListNavigationCallbacks(mDirectories, this);
 -        setSupportProgressBarIndeterminateVisibility(false);        // always AFTER setContentView(...) ; to workaround bug in its implementation
 -        
 -        
 -        // show changelog, if needed
 -        showChangeLog();
 -        
 -        Log.d(getClass().toString(), "onCreate() end");
 -    }
 -
 -    
 -    /**
 -     * Shows a dialog with the change log of the current version after each app update
 -     * 
 -     *  TODO make it permanent; by now, only to advice the workaround app for 4.1.x
 -     */
 -    private void showChangeLog() {
 -        if (android.os.Build.VERSION.SDK_INT == android.os.Build.VERSION_CODES.JELLY_BEAN) {
 -            final String KEY_VERSION = "version";
 -            SharedPreferences sharedPref = PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
 -            int currentVersionNumber = 0;
 -            int savedVersionNumber = sharedPref.getInt(KEY_VERSION, 0);
 -            try {
 -                PackageInfo pi          = getPackageManager().getPackageInfo(getPackageName(), 0);
 -                currentVersionNumber    = pi.versionCode;
 -            } catch (Exception e) {}
 -     
 -            if (currentVersionNumber > savedVersionNumber) {
 -                ChangelogDialog.newInstance(true).show(getSupportFragmentManager(), DIALOG_CHANGELOG_TAG);
 -                Editor editor   = sharedPref.edit();
 -                editor.putInt(KEY_VERSION, currentVersionNumber);
 -                editor.commit();
 -            }
 -        }
 -    }
 -    
 -
 -    /**
 -     * Launches the account creation activity. To use when no ownCloud account is available
 -     */
 -    private void createFirstAccount() {
 -        Intent intent = new Intent(android.provider.Settings.ACTION_ADD_ACCOUNT);
 -        intent.putExtra(android.provider.Settings.EXTRA_AUTHORITIES, new String[] { AccountAuthenticator.AUTH_TOKEN_TYPE });
 -        startActivity(intent);  // the new activity won't be created until this.onStart() and this.onResume() are finished;
 -    }
 -
 -
 -    /**
 -     *  Load of state dependent of the existence of an ownCloud account
 -     */
 -    private void initDataFromCurrentAccount() {
 -        /// Storage manager initialization - access to local database
 -        mStorageManager = new FileDataStorageManager(
 -                AccountUtils.getCurrentOwnCloudAccount(this),
 -                getContentResolver());
 -
 -        /// Check if mCurrentDir is a directory
 -        if(mCurrentDir != null && !mCurrentDir.isDirectory()) {
 -            mCurrentFile = mCurrentDir;
 -            mCurrentDir = mStorageManager.getFileById(mCurrentDir.getParentId());
 -        }
 -        
 -        /// Check if mCurrentDir and mCurrentFile are in the current account, and update them
 -        if (mCurrentDir != null) {
 -            mCurrentDir = mStorageManager.getFileByPath(mCurrentDir.getRemotePath());   // mCurrentDir == null if it is not in the current account
 -        }
 -        if (mCurrentFile != null) {
 -            if (mCurrentFile.fileExists()) {
 -                mCurrentFile = mStorageManager.getFileByPath(mCurrentFile.getRemotePath());   // mCurrentFile == null if it is not in the current account
 -            }   // else : keep mCurrentFile with the received value; this is currently the case of an upload in progress, when the user presses the status notification in a landscape tablet
 -        }
 -        
 -        /// Default to root if mCurrentDir was not found
 -        if (mCurrentDir == null) {
 -            mCurrentDir = mStorageManager.getFileByPath("/"); // will be NULL if the database was never synchronized
 -        }
 -    }
 -        
 -    
 -    private void initFileDetailsInDualPane() {
 -        if (mDualPane && getSupportFragmentManager().findFragmentByTag(FileDetailFragment.FTAG) == null) {
 -            FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
 -            if (mCurrentFile != null) {
 -                transaction.replace(R.id.file_details_container,
 -                        new FileDetailFragment(mCurrentFile, AccountUtils.getCurrentOwnCloudAccount(this)),
 -                        FileDetailFragment.FTAG); // empty FileDetailFragment
 -                mCurrentFile = null;
 -            } else {
 -                transaction.replace(R.id.file_details_container, new FileDetailFragment(null, null),
 -                        FileDetailFragment.FTAG); // empty FileDetailFragment
 -            }
 -            transaction.commit();
 -        }
 -    }
 -    
 -    
 -    @Override
 -    public void onDestroy() {
 -        super.onDestroy();
 -        if (mDownloadConnection != null)
 -            unbindService(mDownloadConnection);
 -        if (mUploadConnection != null)
 -            unbindService(mUploadConnection);
 -    }
 -
 -    
 -    @Override
 -    public boolean onCreateOptionsMenu(Menu menu) {
 -        MenuInflater inflater = getSherlock().getMenuInflater();
 -            inflater.inflate(R.menu.menu, menu);
 -            
 -            patchHiddenAccents(menu);
 -            
 -            return true;
 -    }
 -
 -    /**
 -     * Workaround for this: <a href="http://code.google.com/p/android/issues/detail?id=3974">http://code.google.com/p/android/issues/detail?id=3974</a> 
 -     * 
 -     * @param menu      Menu to patch
 -     */
 -    private void patchHiddenAccents(Menu menu) {
 -        for (int i = 0; i < mMenuIdentifiersToPatch.length ; i++) {
 -            MenuItem aboutItem = menu.findItem(mMenuIdentifiersToPatch[i]);
 -            if (aboutItem != null && aboutItem.getIcon() instanceof BitmapDrawable) {
 -                // Clip off the bottom three (density independent) pixels of transparent padding
 -                Bitmap original = ((BitmapDrawable) aboutItem.getIcon()).getBitmap();
 -                float scale = getResources().getDisplayMetrics().density;
 -                int clippedHeight = (int) (original.getHeight() - (3 * scale));
 -                Bitmap scaled = Bitmap.createBitmap(original, 0, 0, original.getWidth(), clippedHeight);
 -                aboutItem.setIcon(new BitmapDrawable(getResources(), scaled));
 -            }
 -        }
 -    }
 -
 -
 -    @Override
 -    public boolean onOptionsItemSelected(MenuItem item) {
 -        boolean retval = true;
 -        switch (item.getItemId()) {
 -        case R.id.createDirectoryItem: {
 -            showDialog(DIALOG_CREATE_DIR);
 -            break;
 -        }
 -        case R.id.startSync: {
 -            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.about_app: {
 -            showDialog(DIALOG_ABOUT_APP);
 -            break;
 -        }
 -        case android.R.id.home: {
 -            if (mCurrentDir != null && mCurrentDir.getParentId() != 0) {
 -                onBackPressed();
 -            }
 -            break;
 -        }
 -        default:
 -            retval = super.onOptionsItemSelected(item);
 -        }
 -        return retval;
 -    }
 -
 -    private void startSynchronization() {
 -        ContentResolver.cancelSync(null, AccountAuthenticator.AUTH_TOKEN_TYPE);   // cancel the current synchronizations of any ownCloud account
 -        Bundle bundle = new Bundle();
 -        bundle.putBoolean(ContentResolver.SYNC_EXTRAS_MANUAL, true);
 -        ContentResolver.requestSync(
 -                AccountUtils.getCurrentOwnCloudAccount(this),
 -                AccountAuthenticator.AUTH_TOKEN_TYPE, bundle);
 -    }
 -
 -
 -    @Override
 -    public boolean onNavigationItemSelected(int itemPosition, long itemId) {
 -        int i = itemPosition;
 -        while (i-- != 0) {
 -            onBackPressed();
 -        }
 -        // 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 (itemPosition != 0)
 -            getSupportActionBar().setSelectedNavigationItem(0);
 -        return true;
 -    }
 -
 -    /**
 -     * Called, when the user selected something for uploading
 -     */
 -    public void onActivityResult(int requestCode, int resultCode, Intent 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)) {
 -            requestMultipleUpload(data, resultCode);
 -            
 -        }
 -    }
 -
 -    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++) {
 -                remotePaths[j] = remotePathBase + (new File(filePaths[j])).getName();
 -            }
 -
 -            Intent i = new Intent(this, FileUploader.class);
 -            i.putExtra(FileUploader.KEY_ACCOUNT, AccountUtils.getCurrentOwnCloudAccount(this));
 -            i.putExtra(FileUploader.KEY_LOCAL_FILE, filePaths);
 -            i.putExtra(FileUploader.KEY_REMOTE_FILE, remotePaths);
 -            i.putExtra(FileUploader.KEY_UPLOAD_TYPE, FileUploader.UPLOAD_MULTIPLE_FILES);
 -            if (resultCode == UploadFilesActivity.RESULT_OK_AND_MOVE)
 -                i.putExtra(FileUploader.KEY_LOCAL_BEHAVIOUR, FileUploader.LOCAL_BEHAVIOUR_MOVE);
 -            startService(i);
 -            
 -        } else {
 -            Log.d("FileDisplay", "User clicked on 'Update' with no selection");
 -            Toast t = Toast.makeText(this, getString(R.string.filedisplay_no_file_selected), Toast.LENGTH_LONG);
 -            t.show();
 -            return;
 -        }
 -    }
 -
 -
 -    private void requestSimpleUpload(Intent data, int resultCode) {
 -        String filepath = null;
 -        try {
 -            Uri selectedImageUri = data.getData();
 -
 -            String filemanagerstring = selectedImageUri.getPath();
 -            String selectedImagePath = getPath(selectedImageUri);
 -
 -            if (selectedImagePath != null)
 -                filepath = selectedImagePath;
 -            else
 -                filepath = filemanagerstring;
 -            
 -        } catch (Exception e) {
 -            Log.e("FileDisplay", "Unexpected exception when trying to read the result of Intent.ACTION_GET_CONTENT", e);
 -            e.printStackTrace();
 -            
 -        } finally {
 -            if (filepath == null) {
 -                Log.e("FileDisplay", "Couldnt 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, AccountUtils.getCurrentOwnCloudAccount(this));
 -        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;
 -        remotepath += new File(filepath).getName();
 -
 -        i.putExtra(FileUploader.KEY_LOCAL_FILE, filepath);
 -        i.putExtra(FileUploader.KEY_REMOTE_FILE, remotepath);
 -        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);
 -        startService(i);
 -    }
 -
 -
 -    @Override
 -    public void onBackPressed() {
 -        if (mDirectories.getCount() <= 1) {
 -            finish();
 -            return;
 -        }
 -        popDirname();
 -        mFileList.onNavigateUp();
 -        mCurrentDir = mFileList.getCurrentFile();
 -        
 -        if (mDualPane) {
 -            // Resets the FileDetailsFragment on Tablets so that it always
 -            // displays
 -            FileDetailFragment fileDetails = (FileDetailFragment) getSupportFragmentManager().findFragmentByTag(
 -                    FileDetailFragment.FTAG);
 -            if (fileDetails != null && !fileDetails.isEmpty()) {
 -                FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
 -                transaction.remove(fileDetails);
 -                transaction.add(R.id.file_details_container, new FileDetailFragment(null, null),
 -                        FileDetailFragment.FTAG);
 -                transaction.commit();
 -            }
 -        }
 -
 -        if (mCurrentDir.getParentId() == 0) {
 -            ActionBar actionBar = getSupportActionBar();
 -            actionBar.setDisplayHomeAsUpEnabled(false);
 -        }
 -    }
 -
 -    @Override
 -    protected void onSaveInstanceState(Bundle outState) {
 -        // responsibility of restore is preferred in onCreate() before than in onRestoreInstanceState when there are Fragments involved
 -        Log.d(getClass().toString(), "onSaveInstanceState() start");
 -        super.onSaveInstanceState(outState);
 -        outState.putParcelable(FileDetailFragment.EXTRA_FILE, mCurrentDir);
 -        if (mDualPane) {
 -            FileDetailFragment fragment = (FileDetailFragment) getSupportFragmentManager().findFragmentByTag(FileDetailFragment.FTAG);
 -            if (fragment != null) {
 -                OCFile file = fragment.getDisplayedFile();
 -                if (file != null) {
 -                    outState.putParcelable(FileDetailFragment.EXTRA_FILE, file);
 -                }
 -            }
 -        }
 -        Log.d(getClass().toString(), "onSaveInstanceState() end");
 -    }
 -
 -    @Override
 -    protected void onResume() {
 -        Log.d(getClass().toString(), "onResume() start");
 -        super.onResume();
 -
 -        if (AccountUtils.accountsAreSetup(this)) {
 -            
 -            if (mStorageManager == null) {
 -                // this is necessary for handling the come back to FileDisplayActivity when the first ownCloud account is created 
 -                initDataFromCurrentAccount();
 -                if (mDualPane) {
 -                    initFileDetailsInDualPane();
 -                }
 -            }
 -            
 -            // Listen for sync messages
 -            IntentFilter syncIntentFilter = new IntentFilter(FileSyncService.SYNC_MESSAGE);
 -            mSyncBroadcastReceiver = new SyncBroadcastReceiver();
 -            registerReceiver(mSyncBroadcastReceiver, syncIntentFilter);
 -            
 -            // Listen for upload messages
 -            IntentFilter uploadIntentFilter = new IntentFilter(FileUploader.UPLOAD_FINISH_MESSAGE);
 -            mUploadFinishReceiver = new UploadFinishReceiver();
 -            registerReceiver(mUploadFinishReceiver, uploadIntentFilter);
 -            
 -            // Listen for download messages
 -            IntentFilter downloadIntentFilter = new IntentFilter(FileDownloader.DOWNLOAD_FINISH_MESSAGE);
 -            mDownloadFinishReceiver = new DownloadFinishReceiver();
 -            registerReceiver(mDownloadFinishReceiver, downloadIntentFilter);
 -        
 -            // List current directory
 -            mFileList.listDirectory(mCurrentDir);   // TODO we should find the way to avoid the need of this (maybe it's not necessary yet; to check)
 -            
 -        } else {
 -            
 -            mStorageManager = null;     // an invalid object will be there if all the ownCloud accounts are removed
 -            showDialog(DIALOG_SETUP_ACCOUNT);
 -            
 -        }
 -        Log.d(getClass().toString(), "onResume() end");
 -    }
 -
 -    
 -    @Override
 -    protected void onPause() {
 -        Log.d(getClass().toString(), "onPause() start");
 -        super.onPause();
 -        if (mSyncBroadcastReceiver != null) {
 -            unregisterReceiver(mSyncBroadcastReceiver);
 -            mSyncBroadcastReceiver = null;
 -        }
 -        if (mUploadFinishReceiver != null) {
 -            unregisterReceiver(mUploadFinishReceiver);
 -            mUploadFinishReceiver = null;
 -        }
 -        if (mDownloadFinishReceiver != null) {
 -            unregisterReceiver(mDownloadFinishReceiver);
 -            mDownloadFinishReceiver = null;
 -        }
 -        if (!AccountUtils.accountsAreSetup(this)) {
 -            dismissDialog(DIALOG_SETUP_ACCOUNT);
 -        }
 -        
 -        Log.d(getClass().toString(), "onPause() end");
 -    }
 -
 -    
 -    @Override
 -    protected void onPrepareDialog(int id, Dialog dialog, Bundle args) {
 -        if (id == DIALOG_SSL_VALIDATOR && mLastSslUntrustedServerResult != null) {
 -            ((SslValidatorDialog)dialog).updateResult(mLastSslUntrustedServerResult);
 -        }
 -    }
 -
 -    
 -    @Override
 -    protected Dialog onCreateDialog(int id) {
 -        Dialog dialog = null;
 -        AlertDialog.Builder builder;
 -        switch (id) {
 -        case DIALOG_SETUP_ACCOUNT: {
 -            builder = new AlertDialog.Builder(this);
 -            builder.setTitle(R.string.main_tit_accsetup);
 -            builder.setMessage(R.string.main_wrn_accsetup);
 -            builder.setCancelable(false);
 -            builder.setPositiveButton(android.R.string.ok, new OnClickListener() {
 -                public void onClick(DialogInterface dialog, int which) {
 -                    createFirstAccount();
 -                    dialog.dismiss();
 -                }
 -            });
 -            String message = String.format(getString(R.string.common_exit), getString(R.string.app_name));
 -            builder.setNegativeButton(message, new OnClickListener() {
 -                public void onClick(DialogInterface dialog, int which) {
 -                    dialog.dismiss();
 -                    finish();
 -                }
 -            });
 -            //builder.setNegativeButton(android.R.string.cancel, this);
 -            dialog = builder.create();
 -            break;
 -        }
 -        case DIALOG_ABOUT_APP: {
 -            builder = new AlertDialog.Builder(this);
 -            builder.setTitle(getString(R.string.about_title));
 -            PackageInfo pkg;
 -            try {
 -                pkg = getPackageManager().getPackageInfo(getPackageName(), 0);
 -                builder.setMessage(String.format(getString(R.string.about_message), getString(R.string.app_name), pkg.versionName));
 -                builder.setIcon(android.R.drawable.ic_menu_info_details);
 -                dialog = builder.create();
 -            } catch (NameNotFoundException e) {
 -                builder = null;
 -                dialog = null;
 -                Log.e(TAG, "Error while showing about dialog", e);
 -            }
 -            break;
 -        }
 -        case DIALOG_CREATE_DIR: {
 -            builder = new Builder(this);
 -            final EditText dirNameInput = new EditText(getBaseContext());
 -            builder.setView(dirNameInput);
 -            builder.setTitle(R.string.uploader_info_dirname);
 -            int typed_color = getResources().getColor(R.color.setup_text_typed);
 -            dirNameInput.setTextColor(typed_color);
 -            builder.setPositiveButton(android.R.string.ok, new OnClickListener() {
 -                public void onClick(DialogInterface dialog, int which) {
 -                    String directoryName = dirNameInput.getText().toString();
 -                    if (directoryName.trim().length() == 0) {
 -                        dialog.cancel();
 -                        return;
 -                    }
 -
 -                    // Figure out the path where the dir needs to be created
 -                    String path;
 -                    if (mCurrentDir == null) {
 -                        // this is just a patch; we should ensure that
 -                        // mCurrentDir never is null
 -                        if (!mStorageManager.fileExists(OCFile.PATH_SEPARATOR)) {
 -                            OCFile file = new OCFile(OCFile.PATH_SEPARATOR);
 -                            mStorageManager.saveFile(file);
 -                        }
 -                        mCurrentDir = mStorageManager.getFileByPath(OCFile.PATH_SEPARATOR);
 -                    }
 -                    path = FileDisplayActivity.this.mCurrentDir.getRemotePath();
 -
 -                    // Create directory
 -                    path += directoryName + OCFile.PATH_SEPARATOR;
 -                    Thread thread = new Thread(new DirectoryCreator(path, AccountUtils
 -                            .getCurrentOwnCloudAccount(FileDisplayActivity.this), new Handler()));
 -                    thread.start();
 -
 -                    dialog.dismiss();
 -
 -                    showDialog(DIALOG_SHORT_WAIT);
 -                }
 -            });
 -            builder.setNegativeButton(R.string.common_cancel, new OnClickListener() {
 -                public void onClick(DialogInterface dialog, int which) {
 -                    dialog.cancel();
 -                }
 -            });
 -            dialog = builder.create();
 -            break;
 -        }
 -        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: {
 -            final String[] items = { getString(R.string.actionbar_upload_files),
 -                    getString(R.string.actionbar_upload_from_apps), getString(R.string.actionbar_failed_instant_upload) };
 -            builder = new AlertDialog.Builder(this);
 -            builder.setTitle(R.string.actionbar_upload);
 -            builder.setItems(items, 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,
 -                                AccountUtils.getCurrentOwnCloudAccount(FileDisplayActivity.this));
 -                        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);
 -                    } else if (item == 2) {
 -                        Account account = AccountUtils.getCurrentOwnCloudAccount(FileDisplayActivity.this);
 -                        Intent action = new Intent(FileDisplayActivity.this, InstantUploadActivity.class);
 -                        action.putExtra(FileUploader.KEY_ACCOUNT, account);
 -                        startActivity(action);
 -                    }
 -                }
 -            });
 -            dialog = builder.create();
 -            break;
 -        }
 -        case DIALOG_SSL_VALIDATOR: {
 -            dialog = SslValidatorDialog.newInstance(this, mLastSslUntrustedServerResult, this);
 -            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 image or null if it could not be found
 -     */
 -    public String getPath(Uri uri) {
 -        String[] projection = { MediaStore.Images.Media.DATA };
 -        Cursor cursor = managedQuery(uri, projection, null, null, null);
 -        if (cursor != null) {
 -            int column_index = cursor.getColumnIndexOrThrow(MediaStore.Images.Media.DATA);
 -            cursor.moveToFirst();
 -            return cursor.getString(column_index);
 -        }
 -        return null;
 -    }
 -    
 -    /**
 -     * Pushes a directory to the drop down list
 -     * @param directory to push
 -     * @throws IllegalArgumentException If the {@link OCFile#isDirectory()} returns false.
 -     */
 -    public void pushDirname(OCFile directory) {
 -        if(!directory.isDirectory()){
 -            throw new IllegalArgumentException("Only directories may be pushed!");
 -        }
 -        mDirectories.insert(directory.getFileName(), 0);
 -        mCurrentDir = 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();
 -    }
 -
 -    private class DirectoryCreator implements Runnable {
 -        private String mTargetPath;
 -        private Account mAccount;
 -        private Handler mHandler; 
 -    
 -        public DirectoryCreator(String targetPath, Account account, Handler handler) {
 -            mTargetPath = targetPath;
 -            mAccount = account;
 -            mHandler = handler;
 -        }
 -    
 -        @Override
 -        public void run() {
 -            WebdavClient wdc = OwnCloudClientUtils.createOwnCloudClient(mAccount, getApplicationContext());
 -            boolean created = wdc.createDirectory(mTargetPath);
 -            if (created) {
 -                mHandler.post(new Runnable() {
 -                    @Override
 -                    public void run() { 
 -                        dismissDialog(DIALOG_SHORT_WAIT);
 -                        
 -                        // Save new directory in local database
 -                        OCFile newDir = new OCFile(mTargetPath);
 -                        newDir.setMimetype("DIR");
 -                        newDir.setParentId(mCurrentDir.getFileId());
 -                        mStorageManager.saveFile(newDir);
 -    
 -                        // Display the new folder right away
 -                        mFileList.listDirectory();
 -                    }
 -                });
 -                
 -            } else {
 -                mHandler.post(new Runnable() {
 -                    @Override
 -                    public void run() {
 -                        dismissDialog(DIALOG_SHORT_WAIT);
 -                        try {
 -                            Toast msg = Toast.makeText(FileDisplayActivity.this, R.string.create_dir_fail_msg,
 -                                    Toast.LENGTH_LONG);
 -                            msg.show();
 -                        
 -                        } catch (NotFoundException e) {
 -                            Log.e(TAG, "Error while trying to show fail message ", e);
 -                        }
 -                    }
 -                });
 -            }
 -        }
 -    
 -    }
 -
 -    // 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));
 -            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));
 -
 -            return v;
 -        }
 -    
 -    }
 -
 -    private class SyncBroadcastReceiver extends BroadcastReceiver {
 -
 -        /**
 -         * {@link BroadcastReceiver} to enable syncing feedback in UI
 -         */
 -        @Override
 -        public void onReceive(Context context, Intent intent) {
 -            boolean inProgress = intent.getBooleanExtra(FileSyncService.IN_PROGRESS, false);
 -            String accountName = intent.getStringExtra(FileSyncService.ACCOUNT_NAME);
 -
 -            Log.d("FileDisplay", "sync of account " + accountName + " is in_progress: " + inProgress);
 -
 -            if (accountName.equals(AccountUtils.getCurrentOwnCloudAccount(context).name)) {
 -
 -                String synchFolderRemotePath = intent.getStringExtra(FileSyncService.SYNC_FOLDER_REMOTE_PATH);
 -
 -                boolean fillBlankRoot = false;
 -                if (mCurrentDir == null) {
 -                    mCurrentDir = mStorageManager.getFileByPath("/");
 -                    fillBlankRoot = (mCurrentDir != null);
 -                }
 -
 -                if ((synchFolderRemotePath != null && mCurrentDir != null && (mCurrentDir.getRemotePath()
 -                        .equals(synchFolderRemotePath))) || fillBlankRoot) {
 -                    if (!fillBlankRoot)
 -                        mCurrentDir = getStorageManager().getFileByPath(synchFolderRemotePath);
 -                    OCFileListFragment fileListFragment = (OCFileListFragment) getSupportFragmentManager()
 -                            .findFragmentById(R.id.fileList);
 -                    if (fileListFragment != null) {
 -                        fileListFragment.listDirectory(mCurrentDir);
 -                    }
 -                }
 -                
 -                setSupportProgressBarIndeterminateVisibility(inProgress);
 -                removeStickyBroadcast(intent);
 -                
 -            }
 -
 -            RemoteOperationResult synchResult = (RemoteOperationResult) intent
 -                    .getSerializableExtra(FileSyncService.SYNC_RESULT);
 -            if (synchResult != null) {
 -                if (synchResult.getCode().equals(RemoteOperationResult.ResultCode.SSL_RECOVERABLE_PEER_UNVERIFIED)) {
 -                    mLastSslUntrustedServerResult = synchResult;
 -                    showDialog(DIALOG_SSL_VALIDATOR);
 -                }
 -            }
 -        }
 -    }
 -    
 -
 -    private class UploadFinishReceiver extends BroadcastReceiver {
 -        /**
 -         * Once the file upload has finished -> update view
 -         *  @author David A. Velasco
 -         * {@link BroadcastReceiver} to enable upload feedback in UI
 -         */
 -        @Override
 -        public void onReceive(Context context, Intent intent) {
 -            String uploadedRemotePath = intent.getStringExtra(FileDownloader.EXTRA_REMOTE_PATH);
 -            String accountName = intent.getStringExtra(FileUploader.ACCOUNT_NAME);
 -            boolean sameAccount = accountName.equals(AccountUtils.getCurrentOwnCloudAccount(context).name);
 -            boolean isDescendant = (mCurrentDir != null) && (uploadedRemotePath != null)
 -                    && (uploadedRemotePath.startsWith(mCurrentDir.getRemotePath()));
 -            if (sameAccount && isDescendant) {
 -                OCFileListFragment fileListFragment = (OCFileListFragment) getSupportFragmentManager()
 -                        .findFragmentById(R.id.fileList);
 -                if (fileListFragment != null) {
 -                    fileListFragment.listDirectory();
 -                }
 -            }
 -        }
 -        
 -    }
 -    
 -    
 -    /**
 -     * Once the file download has finished -> update view
 -     */
 -    private class DownloadFinishReceiver extends BroadcastReceiver {
 -        @Override
 -        public void onReceive(Context context, Intent intent) {
 -            String downloadedRemotePath = intent.getStringExtra(FileDownloader.EXTRA_REMOTE_PATH);
 -            String accountName = intent.getStringExtra(FileDownloader.ACCOUNT_NAME);
 -            boolean sameAccount = accountName.equals(AccountUtils.getCurrentOwnCloudAccount(context).name);
 -            boolean isDescendant = (mCurrentDir != null) && (downloadedRemotePath != null)
 -                    && (downloadedRemotePath.startsWith(mCurrentDir.getRemotePath()));
 -            if (sameAccount && isDescendant) {
 -                OCFileListFragment fileListFragment = (OCFileListFragment) getSupportFragmentManager()
 -                        .findFragmentById(R.id.fileList);
 -                if (fileListFragment != null) {
 -                    fileListFragment.listDirectory();
 -                }
 -            }
 -        }
 -    }
 -    
 -    
 -    
 -    
 -    /**
 -     * {@inheritDoc}
 -     */
 -    @Override
 -    public DataStorageManager getStorageManager() {
 -        return mStorageManager;
 -    }
 -    
 -    
 -    /**
 -     * {@inheritDoc}
 -     */
 -    @Override
 -    public void onDirectoryClick(OCFile directory) {
 -        pushDirname(directory);
 -        ActionBar actionBar = getSupportActionBar();
 -        actionBar.setDisplayHomeAsUpEnabled(true);
 -        
 -        if (mDualPane) {
 -            // Resets the FileDetailsFragment on Tablets so that it always displays
 -            FileDetailFragment fileDetails = (FileDetailFragment) getSupportFragmentManager().findFragmentByTag(FileDetailFragment.FTAG);
 -            if (fileDetails != null && !fileDetails.isEmpty()) {
 -                FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
 -                transaction.remove(fileDetails);
 -                transaction.add(R.id.file_details_container, new FileDetailFragment(null, null),
 -                        FileDetailFragment.FTAG);
 -                transaction.commit();
 -            }
 -        }
 -    }
 -    
 -    
 -    /**
 -     * {@inheritDoc}
 -     */
 -    @Override
 -    public void onFileClick(OCFile file) {
 -        
 -        // If we are on a large device -> update fragment
 -        if (mDualPane) {
 -            // buttons in the details view are problematic when trying to reuse an existing fragment; create always a new one solves some of them, BUT no all; downloads are 'dangerous'
 -            FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
 -            transaction
 -                    .replace(R.id.file_details_container,
 -                            new FileDetailFragment(file, AccountUtils.getCurrentOwnCloudAccount(this)),
 -                            FileDetailFragment.FTAG);
 -            transaction.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_FADE);
 -            transaction.commit();
 -
 -        } else { // small or medium screen device -> new Activity
 -            Intent showDetailsIntent = new Intent(this, FileDetailActivity.class);
 -            showDetailsIntent.putExtra(FileDetailFragment.EXTRA_FILE, file);
 -            showDetailsIntent.putExtra(FileDetailFragment.EXTRA_ACCOUNT, AccountUtils.getCurrentOwnCloudAccount(this));
 -            startActivity(showDetailsIntent);
 -        }
 -    }
 -    
 -    
 -    /**
 -     * {@inheritDoc}
 -     */
 -    @Override
 -    public OCFile getInitialDirectory() {
 -        return mCurrentDir;
 -    }
 -    
 -    
 -    /**
 -     * {@inheritDoc}
 -     */
 -    @Override
 -    public void onFileStateChanged() {
 -        OCFileListFragment fileListFragment = (OCFileListFragment) getSupportFragmentManager().findFragmentById(
 -                R.id.fileList);
 -        if (fileListFragment != null) {
 -            fileListFragment.listDirectory();
 -        }
 -    }
 -
 -    
 -    /**
 -     * {@inheritDoc}
 -     */
 -    @Override
 -    public FileDownloaderBinder getFileDownloaderBinder() {
 -        return mDownloaderBinder;
 -    }
 -
 -    
 -    /**
 -     * {@inheritDoc}
 -     */
 -    @Override
 -    public FileUploaderBinder getFileUploaderBinder() {
 -        return mUploaderBinder;
 -    }
 -    
 -    
 -    /** 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))) {
 -                Log.d(TAG, "Download service connected");
 -                mDownloaderBinder = (FileDownloaderBinder) service;
 -            } else if (component.equals(new ComponentName(FileDisplayActivity.this, FileUploader.class))) {
 -                Log.d(TAG, "Upload service connected");
 -                mUploaderBinder = (FileUploaderBinder) service;
 -            } else {
 -                return;
 -            }
 -            // a new chance to get the mDownloadBinder through getFileDownloadBinder() - THIS IS A MESS
 -            if (mFileList != null)
 -                mFileList.listDirectory();
 -            if (mDualPane) {
 -                FileDetailFragment fragment = (FileDetailFragment) getSupportFragmentManager().findFragmentByTag(
 -                        FileDetailFragment.FTAG);
 -                if (fragment != null)
 -                    fragment.updateFileDetails(false);
 -            }
 -        }
 -
 -        @Override
 -        public void onServiceDisconnected(ComponentName component) {
 -            if (component.equals(new ComponentName(FileDisplayActivity.this, FileDownloader.class))) {
 -                Log.d(TAG, "Download service disconnected");
 -                mDownloaderBinder = null;
 -            } else if (component.equals(new ComponentName(FileDisplayActivity.this, FileUploader.class))) {
 -                Log.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() {
 -        startSynchronization();                
 -    }
 -
 -    @Override
 -    public void onFailedSavingCertificate() {
 -        showDialog(DIALOG_CERT_NOT_SAVED);
 -    }
 -
 -
 -    /**
 -     * 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.
 -     */
 -    @Override
 -    public void onRemoteOperationFinish(RemoteOperation operation, RemoteOperationResult result) {
 -        if (operation instanceof RemoveFileOperation) {
 -            onRemoveFileOperationFinish((RemoveFileOperation) operation, result);
 -
 -        } else if (operation instanceof RenameFileOperation) {
 -            onRenameFileOperationFinish((RenameFileOperation) operation, result);
 -
 -        } else if (operation instanceof SynchronizeFileOperation) {
 -            onSynchronizeFileOperationFinish((SynchronizeFileOperation) operation, result);
 -        }
 -    }
 -
 -
 -    /**
 -     * 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) {
 -        dismissDialog(DIALOG_SHORT_WAIT);
 -        if (result.isSuccess()) {
 -            Toast msg = Toast.makeText(this, R.string.remove_success_msg, Toast.LENGTH_LONG);
 -            msg.show();
 -            OCFile removedFile = operation.getFile();
 -            if (mDualPane) {
 -                FileDetailFragment details = (FileDetailFragment) getSupportFragmentManager().findFragmentByTag(
 -                        FileDetailFragment.FTAG);
 -                if (details != null && removedFile.equals(details.getDisplayedFile())) {
 -                    FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
 -                    transaction.replace(R.id.file_details_container, new FileDetailFragment(null, null)); // empty
 -                                                                                                          // FileDetailFragment
 -                    transaction.commit();
 -                }
 -            }
 -            if (mStorageManager.getFileById(removedFile.getParentId()).equals(mCurrentDir)) {
 -                mFileList.listDirectory();
 -            }
 -                
 -        } else {
 -            Toast msg = Toast.makeText(this, R.string.remove_fail_msg, Toast.LENGTH_LONG);
 -            msg.show();
 -            if (result.isSslRecoverableException()) {
 -                mLastSslUntrustedServerResult = result;
 -                showDialog(DIALOG_SSL_VALIDATOR);
 -            }
 -        }
 -    }
 -
 -    /**
 -     * 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) {
 -        dismissDialog(DIALOG_SHORT_WAIT);
 -        OCFile renamedFile = operation.getFile();
 -        if (result.isSuccess()) {
 -            if (mDualPane) {
 -                FileDetailFragment details = (FileDetailFragment) getSupportFragmentManager().findFragmentByTag(
 -                        FileDetailFragment.FTAG);
 -                if (details != null && renamedFile.equals(details.getDisplayedFile())) {
 -                    details.updateFileDetails(renamedFile, AccountUtils.getCurrentOwnCloudAccount(this));
 -                }
 -            }
 -            if (mStorageManager.getFileById(renamedFile.getParentId()).equals(mCurrentDir)) {
 -                mFileList.listDirectory();
 -            }
 -            
 -        } else {
 -            if (result.getCode().equals(ResultCode.INVALID_LOCAL_FILE_NAME)) {
 -                Toast msg = Toast.makeText(this, R.string.rename_local_fail_msg, Toast.LENGTH_LONG);
 -                msg.show();
 -                // TODO throw again the new rename dialog
 -            } else {
 -                Toast msg = Toast.makeText(this, R.string.rename_server_fail_msg, Toast.LENGTH_LONG);
 -                msg.show();
 -                if (result.isSslRecoverableException()) {
 -                    mLastSslUntrustedServerResult = result;
 -                    showDialog(DIALOG_SSL_VALIDATOR);
 -                }
 -            }
 -        }
 -    }
 -
 -    private void onSynchronizeFileOperationFinish(SynchronizeFileOperation operation, RemoteOperationResult result) {
 -        dismissDialog(DIALOG_SHORT_WAIT);
 -        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, AccountUtils.getCurrentOwnCloudAccount(this));
 -                startActivity(i);
 -                
 -            } else {
 -                Toast msg = Toast.makeText(this, R.string.sync_file_fail_msg, Toast.LENGTH_LONG);
 -                msg.show();
 -            }
 -            
 -        } else {
 -            if (operation.transferWasRequested()) {
 -                mFileList.listDirectory();
 -                onTransferStateChanged(syncedFile, true, true);
 -                
 -            } else {
 -                Toast msg = Toast.makeText(this, R.string.sync_file_nothing_to_do_msg, Toast.LENGTH_LONG);
 -                msg.show();
 -            }
 -        }
 -    }
 -
 -
 -    /**
 -     * {@inheritDoc}
 -     */
 -    @Override
 -    public void onTransferStateChanged(OCFile file, boolean downloading, boolean uploading) {
 -        /*OCFileListFragment fileListFragment = (OCFileListFragment) getSupportFragmentManager().findFragmentById(R.id.fileList);
 -        if (fileListFragment != null) { 
 -            fileListFragment.listDirectory();
 -        }*/
 -        if (mDualPane) {
 -            FileDetailFragment details = (FileDetailFragment) getSupportFragmentManager().findFragmentByTag(
 -                    FileDetailFragment.FTAG);
 -            if (details != null && file.equals(details.getDisplayedFile())) {
 -                if (downloading || uploading) {
 -                    details.updateFileDetails(file, AccountUtils.getCurrentOwnCloudAccount(this));
 -                } else {
 -                    details.updateFileDetails(downloading || uploading);
 -                }
 -            }
 -        }
 -    }
 -
 -
 -    
 -
 -
 -}