From: David A. Velasco <dvelasco@solidgear.es>
Date: Thu, 4 Apr 2013 14:44:30 +0000 (+0200)
Subject: Merge branch 'develop' into feature_previews
X-Git-Tag: oc-android-1.4.3~39^2~6
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/77ddd1ccb62e8b70580b8f410dda703a269f224f?ds=inline;hp=-c

Merge branch 'develop' into feature_previews

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
---

77ddd1ccb62e8b70580b8f410dda703a269f224f
diff --combined AndroidManifest.xml
index 279beba2,32c4655a..42c51748
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@@ -3,9 -3,11 +3,11 @@@
    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 3 of the License, or
+   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,
@@@ -33,8 -35,7 +35,8 @@@
      <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
      <uses-permission android:name="android.permission.READ_PHONE_STATE" />
      <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
 -
 +    <uses-permission android:name="android.permission.WAKE_LOCK"/>
 +    
      <uses-sdk
          android:minSdkVersion="8"
          android:targetSdkVersion="13" />
@@@ -57,6 -58,9 +59,9 @@@
          </activity>
          <activity android:name=".ui.activity.UploadFilesActivity">
          </activity>
+  		<activity android:name=".ui.activity.InstantUploadActivity">
+         </activity>
+         <activity android:name=".ui.activity.FailedUploadActivity" android:theme="@android:style/Theme.Dialog" android:excludeFromRecents="true"/>
          <activity android:name=".Uploader" >
              <intent-filter>
                  <action android:name="android.intent.action.SEND" >
@@@ -85,13 -89,6 +90,13 @@@
          </activity>
          <activity android:name=".ui.activity.PreferencesNewSessionewSession" >
          </activity>
 +        
 +		<activity	android:name="com.owncloud.android.ui.preview.PreviewImageActivity" />
 +		        
 +        <activity	android:name="com.owncloud.android.ui.preview.PreviewVideoActivity"
 +					android:label="@string/app_name"
 +					android:theme="@android:style/Theme.NoTitleBar.Fullscreen" >
 +		</activity>        
  
          <service
              android:name=".authenticator.AccountAuthenticatorService"
@@@ -135,27 -132,28 +140,27 @@@
              </intent-filter>
          </activity>
  
 -        <service android:name=".files.services.FileDownloader" >
 -        </service>
 +        <service android:name=".files.services.FileDownloader" />
 +        <service android:name=".files.services.FileUploader" />
 +        <service android:name=".media.MediaService" />
  
-         <activity android:name=".ui.activity.FileDetailActivity" />
+         <activity android:name=".ui.activity.FileDetailActivity" />
          <activity android:name=".ui.activity.PinCodeActivity" />
-         <activity android:name=".extensions.ExtensionsAvailableActivity"></activity>
+         <activity android:name=".extensions.ExtensionsAvailableActivity"></activity>
          <activity android:name=".extensions.ExtensionsListActivity"></activity>
          <activity android:name=".ui.activity.AccountSelectActivity" android:uiOptions="none" android:label="@string/prefs_accounts"></activity>
-         <activity android:name=".ui.activity.ConflictsResolveActivity"/>
+         <activity android:name=".ui.activity.ConflictsResolveActivity"/>
          <activity android:name=".ui.activity.GenericExplanationActivity"/>
          <activity android:name=".ui.activity.ErrorsWhileCopyingHandlerActivity"/>
 -        
 -        <service android:name=".files.services.FileUploader" >
 -        </service>
 -        <service android:name=".files.services.InstantUploadService" />
 +        
 +        <service android:name=".files.services.InstantUploadService" />
          <receiver android:name=".files.InstantUploadBroadcastReceiver">
              <intent-filter>
                  <action android:name="com.android.camera.NEW_PICTURE" />
                  <data android:mimeType="image/*" />
-             </intent-filter>
-             <intent-filter>
-                 <action android:name="android.net.conn.CONNECTIVITY_CHANGE"/>
+             </intent-filter>
+             <intent-filter>
+                 <action android:name="android.net.conn.CONNECTIVITY_CHANGE"/>
              </intent-filter>
          </receiver>
          <receiver android:name=".files.BootupBroadcastReceiver">
@@@ -163,7 -161,7 +168,7 @@@
                  <action android:name="android.intent.action.BOOT_COMPLETED"/>
              </intent-filter>
          </receiver>
-         <service android:name=".files.services.FileObserverService"/>
+         <service android:name=".files.services.FileObserverService"/>
      </application>
  
- </manifest>
+ </manifest>
diff --combined res/layout/file_details_fragment.xml
index b562937c,dcce819e..c2b8af31
--- a/res/layout/file_details_fragment.xml
+++ b/res/layout/file_details_fragment.xml
@@@ -3,9 -3,11 +3,11 @@@
    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 3 of the License, or
+   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,
@@@ -16,225 -18,224 +18,225 @@@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
  -->
 -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
 -    android:layout_width="fill_parent"
 -    android:layout_height="fill_parent"
 -    android:background="@color/owncloud_white" >
 -
 -    <ScrollView
 -        android:id="@+id/fdScrollView"
 -        android:layout_width="fill_parent"
 -        android:layout_height="fill_parent" >
 -
 -        <RelativeLayout
 -            android:layout_width="match_parent"
 -            android:layout_height="wrap_content" >
 -
 -            <RelativeLayout
 -                android:id="@+id/fdFileHeaderContainer"
 -                android:layout_width="match_parent"
 -                android:layout_height="wrap_content"
 -                android:layout_marginLeft="16dp"
 -                android:layout_marginTop="4dp" >
 -
 -                <ImageView
 -                    android:id="@+id/fdIcon"
 -                    android:layout_width="wrap_content"
 -                    android:layout_height="wrap_content"
 -                    android:src="@drawable/file" />
 -
 -                <TextView
 -                    android:id="@+id/fdFilename"
 -                    android:layout_width="wrap_content"
 -                    android:layout_height="wrap_content"
 -                    android:layout_centerVertical="true"
 -                    android:layout_toRightOf="@+id/fdIcon"
 -                    android:text="file.name"
 -                    android:textAppearance="?android:attr/textAppearanceLarge" />
 -            </RelativeLayout>
 -
 -            <RelativeLayout
 -                android:id="@+id/fdDetailsContainer"
 -                android:layout_width="match_parent"
 -                android:layout_height="wrap_content"
 -                android:layout_below="@+id/fdFileHeaderContainer" >
 -
 -                <RelativeLayout
 -                    android:id="@+id/fdLabelContainer"
 -                    android:layout_width="wrap_content"
 -                    android:layout_height="wrap_content"
 -                    android:layout_alignParentLeft="true"
 -                    android:layout_alignParentTop="true"
 -                    android:layout_marginLeft="16dp" >
 -
 -                    <TextView
 -                        android:id="@+id/fdTypeLabel"
 -                        android:layout_width="wrap_content"
 -                        android:layout_height="wrap_content"
 -                        android:layout_marginTop="24dp"
 -                        android:text="@string/filedetails_type"
 -                        android:textAppearance="?android:attr/textAppearanceMedium" />
 -
 -                    <TextView
 -                        android:id="@+id/fdSizeLabel"
 -                        android:layout_width="wrap_content"
 -                        android:layout_height="wrap_content"
 -                        android:layout_below="@+id/fdTypeLabel"
 -                        android:layout_marginTop="12dp"
 -                        android:text="@string/filedetails_size"
 -                        android:textAppearance="?android:attr/textAppearanceMedium" />
 -
 -                    <TextView
 -                        android:id="@+id/fdCreatedLabel"
 -                        android:layout_width="wrap_content"
 -                        android:layout_height="wrap_content"
 -                        android:layout_below="@+id/fdSizeLabel"
 -                        android:layout_marginTop="12dp"
 -                        android:text="@string/filedetails_created"
 -                        android:visibility="gone"
 -                        android:textAppearance="?android:attr/textAppearanceMedium" />
 -                    
 -                    <TextView
 -                        android:id="@+id/fdModifiedLabel"
 -                        android:layout_width="wrap_content"
 -                        android:layout_height="wrap_content"
 -                        android:layout_below="@+id/fdCreatedLabel"
 -                        android:layout_marginTop="12dp"
 -                        android:text="@string/filedetails_modified"
 -                        android:textAppearance="?android:attr/textAppearanceMedium" />
 -                </RelativeLayout>
 -
 -                <RelativeLayout
 -                    android:id="@+id/fdValueContainer"
 -                    android:layout_width="wrap_content"
 -                    android:layout_height="wrap_content"
 -                    android:layout_alignParentTop="true"
 -                    android:layout_marginLeft="12dp"
 -                    android:layout_toRightOf="@+id/fdLabelContainer" >
 -
 -                    <TextView
 -                        android:id="@+id/fdType"
 -                        android:layout_width="wrap_content"
 -                        android:layout_height="wrap_content"
 -                        android:layout_marginTop="24dp"
 -                        android:text="JPG Image"
 -                        android:textAppearance="?android:attr/textAppearanceMedium" />
 -
 -                    <TextView
 -                        android:id="@+id/fdSize"
 -                        android:layout_width="wrap_content"
 -                        android:layout_height="wrap_content"
 -                        android:layout_below="@+id/fdType"
 -                        android:layout_marginTop="12dp"
 -                        android:text="389 KB"
 -                        android:textAppearance="?android:attr/textAppearanceMedium" />
 -
 -                    <TextView
 -                        android:id="@+id/fdCreated"
 -                        android:layout_width="wrap_content"
 -                        android:layout_height="wrap_content"
 -                        android:layout_below="@+id/fdSize"
 -                        android:layout_marginTop="12dp"
 -                        android:visibility="gone"
 -                        android:text="2012/05/18 12:23 PM"
 -                        android:textAppearance="?android:attr/textAppearanceMedium" />
 -
 -                    <TextView
 -                        android:id="@+id/fdModified"
 -                        android:layout_width="wrap_content"
 -                        android:layout_height="wrap_content"
 -                        android:layout_below="@+id/fdCreated"
 -                        android:layout_marginTop="12dp"
 -                        android:text="2012/05/19 02:56 PM"
 -                        android:textAppearance="?android:attr/textAppearanceMedium" />
 -                </RelativeLayout>
 -
 -            </RelativeLayout>
 -
 -            <RelativeLayout
 -                android:id="@+id/fdPreviewAndDL"
 -                android:layout_width="match_parent"
 -                android:layout_height="wrap_content"
 -                android:layout_below="@+id/fdDetailsContainer"
 -                android:gravity="center_horizontal" >
 -
 -                <CheckBox
 -                    android:id="@+id/fdKeepInSync"
 -                    android:layout_width="wrap_content"
 -                    android:layout_height="wrap_content"
 -                    android:layout_centerHorizontal="true"
 -                    android:text="@string/fd_keep_in_sync" />
 -
 -                <ImageView
 -                    android:id="@+id/fdPreview"
 -                    android:layout_width="match_parent"
 -                    android:layout_height="match_parent"
 -                    android:layout_below="@id/fdKeepInSync"
 -                    android:layout_centerHorizontal="true"
 -                    android:layout_marginTop="16dp"
 -                    android:src="@drawable/owncloud_logo" />
 -
 -                <LinearLayout
 -                    android:layout_width="match_parent"
 -                    android:layout_height="wrap_content"
 -                    android:layout_below="@id/fdPreview"
 -                    android:orientation="vertical" >
 -
 -                    <LinearLayout
 -                        android:layout_width="match_parent"
 -                        android:layout_height="wrap_content"
 -                        android:gravity="center_horizontal" >
 -
 -                        <Button
 -                            android:id="@+id/fdRemoveBtn"
 -                            android:layout_width="wrap_content"
 -                            android:layout_height="wrap_content"
 -                            android:layout_marginTop="12dp"
 -                            android:text="@string/common_remove" />
 -
 -                        <Button
 -                            android:id="@+id/fdOpenBtn"
 -                            android:layout_width="wrap_content"
 -                            android:layout_height="wrap_content"
 -                            android:layout_marginTop="12dp"
 -                            android:text="@string/filedetails_open" />
 -
 -                    </LinearLayout>
 -
 -                    <LinearLayout
 -                        android:layout_width="match_parent"
 -                        android:layout_height="wrap_content"
 -                        android:gravity="center_horizontal">
 -
 -                        <Button
 -                            android:id="@+id/fdDownloadBtn"
 -                            android:layout_width="wrap_content"
 -                            android:layout_height="wrap_content"
 -                            android:layout_marginTop="12dp"
 -                            android:text="@string/filedetails_download" />
 -
 -                        <Button
 -                            android:id="@+id/fdRenameBtn"
 -                            android:layout_width="wrap_content"
 -                            android:layout_height="wrap_content"
 -                            android:layout_marginTop="12dp"
 -                            android:text="@string/common_rename" />
 -
 -                    </LinearLayout>
 -<!-- 
 -                    <Button
 -                        android:id="@+id/fdShareBtn"
 -                        android:layout_width="wrap_content"
 -                        android:layout_height="wrap_content"
 -                        android:layout_marginTop="12dp"
 -                        android:text="@string/common_share" />
 - -->
 -
 -                </LinearLayout>
 -            </RelativeLayout>
 -
 -        </RelativeLayout>
 -    </ScrollView>
 -
 -</RelativeLayout>
 +<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
 +	android:id="@+id/fdScrollView"
 +	android:layout_width="fill_parent"
 +	android:layout_height="fill_parent" >
 +
 +	<RelativeLayout
 +		android:layout_width="match_parent"
 +		android:layout_height="wrap_content" >
 +
 +		<RelativeLayout
 +			android:id="@+id/fdFileHeaderContainer"
 +			android:layout_width="match_parent"
 +			android:layout_height="wrap_content"
 +			android:layout_marginLeft="16dp"
 +			android:layout_marginTop="4dp" >
 +	
 +			<ImageView
 +				android:id="@+id/fdIcon"
 +				android:layout_width="wrap_content"
 +				android:layout_height="wrap_content"
 +				android:src="@drawable/file" />
 +				
 +			<TextView
 +			    android:id="@+id/fdFilename"
 +			    android:layout_width="wrap_content"
 +			    android:layout_height="wrap_content"
 +			    android:layout_centerVertical="true"
 +			    android:layout_toRightOf="@+id/fdIcon"
 +			    android:text="@string/placeholder_filename"
 +			    android:textAppearance="?android:attr/textAppearanceLarge" />
 +			
 +		</RelativeLayout>
 +	
 +		<RelativeLayout
 +			android:id="@+id/fdDetailsContainer"
 +			android:layout_width="match_parent"
 +			android:layout_height="wrap_content"
 +			android:layout_below="@id/fdFileHeaderContainer" >
 +		
 +			<RelativeLayout
 +				android:id="@+id/fdLabelContainer"
 +				android:layout_width="wrap_content"
 +				android:layout_height="wrap_content"
 +				android:layout_alignParentLeft="true"
 +				android:layout_alignParentTop="true"
 +				android:layout_marginLeft="16dp" >
 +				
 +				<TextView
 +					android:id="@+id/fdTypeLabel"
 +					android:layout_width="wrap_content"
 +					android:layout_height="wrap_content"
 +					android:layout_marginTop="24dp"
 +					android:text="@string/filedetails_type"
 +					android:textAppearance="?android:attr/textAppearanceMedium" />
 +					
 +				<TextView
 +					android:id="@+id/fdSizeLabel"
 +					android:layout_width="wrap_content"
 +					android:layout_height="wrap_content"
 +					android:layout_below="@+id/fdTypeLabel"
 +					android:layout_marginTop="12dp"
 +					android:text="@string/filedetails_size"
 +					android:textAppearance="?android:attr/textAppearanceMedium" />
 +					
 +				<TextView
 +					android:id="@+id/fdCreatedLabel"
 +					android:layout_width="wrap_content"
 +					android:layout_height="wrap_content"
 +					android:layout_below="@+id/fdSizeLabel"
 +					android:layout_marginTop="12dp"
 +					android:text="@string/filedetails_created"
 +					android:visibility="gone"
 +					android:textAppearance="?android:attr/textAppearanceMedium" />
 +					  
 +				<TextView
 +					android:id="@+id/fdModifiedLabel"
 +					android:layout_width="wrap_content"
 +					android:layout_height="wrap_content"
 +					android:layout_below="@+id/fdCreatedLabel"
 +					android:layout_marginTop="12dp"
 +					android:text="@string/filedetails_modified"
 +					android:textAppearance="?android:attr/textAppearanceMedium" />
 +			</RelativeLayout>
 +	
 +			<RelativeLayout
 +				android:id="@+id/fdValueContainer"
 +				android:layout_width="wrap_content"
 +				android:layout_height="wrap_content"
 +				android:layout_alignParentTop="true"
 +				android:layout_marginLeft="12dp"
 +				android:layout_toRightOf="@+id/fdLabelContainer" >
 +				
 +				<TextView
 +					android:id="@+id/fdType"
 +					android:layout_width="wrap_content"
 +					android:layout_height="wrap_content"
 +					android:layout_marginTop="24dp"
 +					android:text="@string/placeholder_filetype"
 +					android:textAppearance="?android:attr/textAppearanceMedium" />
 +					
 +				<TextView
 +					android:id="@+id/fdSize"
 +					android:layout_width="wrap_content"
 +					android:layout_height="wrap_content"
 +					android:layout_below="@+id/fdType"
 +					android:layout_marginTop="12dp"
 +					android:text="@string/placeholder_filesize"
 +					android:textAppearance="?android:attr/textAppearanceMedium" />
 +					
 +				<TextView
 +					android:id="@+id/fdCreated"
 +					android:layout_width="wrap_content"
 +					android:layout_height="wrap_content"
 +					android:layout_below="@+id/fdSize"
 +					android:layout_marginTop="12dp"
 +					android:visibility="gone"
 +					android:text="@string/placeholder_timestamp"
 +					android:textAppearance="?android:attr/textAppearanceMedium" />
 +					
 +				<TextView
 +					android:id="@+id/fdModified"
 +					android:layout_width="wrap_content"
 +					android:layout_height="wrap_content"
 +					android:layout_below="@+id/fdCreated"
 +					android:layout_marginTop="12dp"
 +					android:text="@string/placeholder_timestamp"
 +					android:textAppearance="?android:attr/textAppearanceMedium" />
 +		
 +			</RelativeLayout>
 +	
 +		</RelativeLayout>
 +	
 +		<RelativeLayout
 +			android:id="@+id/fdProgressAndControl"
 +			android:layout_width="match_parent"
 +			android:layout_height="wrap_content"
 +			android:layout_below="@+id/fdDetailsContainer"
 +			android:gravity="center_horizontal" 
 +			android:layout_margin="16dp"
 +			>
 +			
 +			<CheckBox
 +				android:id="@+id/fdKeepInSync"
 +				android:layout_width="wrap_content"
 +				android:layout_height="wrap_content"
 +				android:layout_centerHorizontal="true"
 +				android:text="@string/fd_keep_in_sync" />
 +
 +			<LinearLayout
 +				android:layout_width="match_parent"
 +				android:layout_height="wrap_content"
 +				android:layout_below="@id/fdKeepInSync"
 +				android:orientation="vertical" >
 +				
 +    			<TextView 
 +    			    android:id="@+id/fdProgressText" 
 +    			    android:layout_width="match_parent"
 +      				android:layout_height="wrap_content" 
 +      				android:text="@string/downloader_download_in_progress_ticker"
 +      				/>
 +    			
 +    			<ProgressBar android:id="@+id/fdProgressBar"
 +					android:layout_width="match_parent" 
 +					android:layout_height="wrap_content"
 +					android:progressDrawable="@android:drawable/progress_horizontal"
 +					android:indeterminate="false" 
 +					android:indeterminateOnly="false" 
 +					/>
 +				    								
 +			    <LinearLayout
 +					android:layout_width="match_parent"
 +					android:layout_height="wrap_content"
 +					android:gravity="center_horizontal"
 +					android:layout_marginTop="12dp"
 +					>
 +				    				
 +					<Button
 +						android:id="@+id/fdDownloadBtn"
 +						android:layout_width="0dp"
 +						android:layout_height="wrap_content"
 +						android:layout_weight="1"
 +						android:text="@string/filedetails_download" />
 +						
 +					<Button
 +						android:id="@+id/fdOpenBtn"
 +						android:layout_width="0dp"
 +						android:layout_height="wrap_content"
 +						android:layout_weight="1"
 +						android:text="@string/filedetails_open" />
 +						
 +				</LinearLayout>
 +		
 +				<LinearLayout
 +					android:layout_width="match_parent"
 +					android:layout_height="wrap_content"
 +					android:gravity="center_horizontal"
 +					android:layout_marginTop="12dp"
 +					>
 +					
 +					<Button
 +						android:id="@+id/fdRenameBtn"
 +						android:layout_width="0dp"
 +						android:layout_height="wrap_content"
 +						android:layout_weight="1"
 +						android:text="@string/common_rename" />
 +						
 +				    <Button
 +						android:id="@+id/fdRemoveBtn"
 +						android:layout_width="0dp"
 +						android:layout_height="wrap_content"
 +						android:layout_weight="1"
 +						android:text="@string/common_remove" />
 +						
 +				</LinearLayout>
 +	
 +			</LinearLayout>
 +			
 +		</RelativeLayout>
 +
 +	</RelativeLayout>
 +	
 +</ScrollView>
diff --combined res/menu/file_actions_menu.xml
index 8a06e7ea,00000000..bce33ebc
mode 100644,000000..100644
--- a/res/menu/file_actions_menu.xml
+++ b/res/menu/file_actions_menu.xml
@@@ -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>
diff --combined res/menu/main_menu.xml
index 2aff9e36,00000000..a3b8d5e0
mode 100644,000000..100644
--- a/res/menu/main_menu.xml
+++ b/res/menu/main_menu.xml
@@@ -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>
diff --combined res/values-de-rDE/strings.xml
index 79014c51,0646f111..9f20caeb
--- a/res/values-de-rDE/strings.xml
+++ b/res/values-de-rDE/strings.xml
@@@ -82,8 -82,6 +82,8 @@@
    <string name="common_save_exit">Speichern &amp; Schließen</string>
    <string name="common_exit">%1$s verlassen</string>
    <string name="common_error">Fehler</string>
 +  <string name="common_loading">Wird geladen &#8230;</string>
 +  <string name="common_error_unknown">Unbekannter Fehler</string>
    <string name="about_title">Über</string>
    <string name="delete_account">Account löschen</string>
    <string name="create_account">Account erstellen</string>
@@@ -103,7 -101,6 +103,7 @@@
    <string name="downloader_download_succeeded_content">%1$s wurde erfolgreich heruntergeladen</string>
    <string name="downloader_download_failed_ticker">Herunterladen fehlgeschlagen</string>
    <string name="downloader_download_failed_content">Herunterladen von %1$s konnte nicht abgeschlossen werden</string>
 +  <string name="downloader_not_downloaded_yet">Noch nicht heruntergeladen</string>
    <string name="common_choose_account">Konto auswählen</string>
    <string name="sync_string_contacts">Kontakte</string>
    <string name="sync_fail_ticker">Synchronisation fehlgeschlagen</string>
@@@ -124,26 -121,6 +124,26 @@@
    <string name="pincode_wrong">Falsche App-PIN</string>
    <string name="pincode_removed">Die App-PIN wurde entfernt</string>
    <string name="pincode_stored">Die App-PIN wurde gespeichert</string>
 +  <string name="media_notif_ticker">"%1$s Musik Player"</string>
 +  <string name="media_state_playing">"%1$s (wird abgespielt)"</string>
 +  <string name="media_state_loading">"%1$s (wird geladen)"</string>
 +  <string name="media_event_done">"%1$s Wiedergabe beendet"</string>
 +  <string name="media_err_nothing_to_play">Keine Media-Datei gefunden</string>
 +  <string name="media_err_no_account">Ungültiger Account</string>
 +  <string name="media_err_not_in_owncloud">Datei ist nicht in einem gültigen Account</string>
 +  <string name="media_err_unsupported">Nicht unterstützter Medien-Codec</string>
 +  <string name="media_err_io">Media-Datei konnte nicht gelesen werden</string>
 +  <string name="media_err_malformed">Die Media-Datei ist noch nicht kodiert</string>
 +  <string name="media_err_timeout">Zeitüberschreitung ist beim Abspielen aufgetreten</string>
 +  <string name="media_err_invalid_progressive_playback">Media-Datei konnte nicht gestreamt werden</string>
 +  <string name="media_err_unknown">Media-Datei kann nicht vom Standard Player wiedergegeben werden</string>
 +  <string name="media_err_security_ex">Sicherheits-Fehler ist beim Abspielen aufgetreten %1$s</string>
 +  <string name="media_err_io_ex">Eingabe-Fehler ist beim Abspielen aufgetreten %1$s</string>
 +  <string name="media_err_unexpected">Unerwarteter Fehler bei der Wiedergabe %1$s</string>
 +  <string name="media_rewind_description">Zurückspulen</string>
 +  <string name="media_play_pause_description">Wiedergabe oder Pause</string>
 +  <string name="media_forward_description">Vorspulen</string>
 +	
    <string-array name="prefs_trackmydevice_intervall_keys">
      <item>15 Minuten</item>
      <item>30 Minuten</item>
@@@ -239,7 -216,14 +239,17 @@@
    <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>
diff --combined res/values/strings.xml
index 45b9222e,644e618b..9abfa798
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@@ -1,5 -1,6 +1,6 @@@
  <?xml version="1.0" encoding="utf-8"?>
  <resources>
+ 
      <string name="app_name">ownCloud</string>
      <string name="whats_new">What\'s new</string>
      <string name="main_password">Password:</string>
@@@ -14,9 -15,7 +15,7 @@@
      <string name="main_settings">Settings</string>
      <string name="main_tit_accsetup">Setup Account</string>
      <string name="main_wrn_accsetup">There is no account set up on your device. In order to use this App, you need to create one.</string>
-     
      <string name="about_message">%1$s Android App\n\nversion: %2$s</string>
-     
      <string name="actionbar_sync">Refresh</string>
      <string name="actionbar_upload">Upload</string>
      <string name="actionbar_upload_from_apps">Content from other apps</string>
@@@ -24,8 -23,6 +23,8 @@@
      <string name="actionbar_mkdir">Create directory</string>
      <string name="actionbar_search">Search</string>
      <string name="actionbar_settings">Settings</string>
 +    <string name="actionbar_see_details">Details</string>
 +    
      <string name="prefs_category_general">General</string>
      <string name="prefs_category_trackmydevice">Device tracking</string>
      <string name="prefs_add_session">Add new session</string>
@@@ -43,7 -40,6 +42,6 @@@
      <string name="prefs_pincode_summary">Protect your client</string>
      <string name="prefs_instant_upload">Enable instant uploads</string>
      <string name="prefs_instant_upload_summary">Instantly upload photos taken by camera</string>
-     
      <string name="auth_host_url">URL</string>
      <string name="auth_username">Username</string>
      <string name="auth_password">Password</string>
@@@ -63,12 -59,12 +61,12 @@@
      <string name="uploader_wrn_no_account_text">There are no %1$s accounts on your device. Please setup an account first.</string>
      <string name="uploader_wrn_no_account_setup_btn_text">Setup</string>
      <string name="uploader_wrn_no_account_quit_btn_text">Quit</string>
- 	<string name="uploader_wrn_no_content_title">No content to upload</string>
- 	<string name="uploader_wrn_no_content_text">No content was received. Nothing to upload.</string>
+     <string name="uploader_wrn_no_content_title">No content to upload</string>
+     <string name="uploader_wrn_no_content_text">No content was received. Nothing to upload.</string>
      <string name="uploader_error_forbidden_content">%1$s is not allowed to access the shared content</string>
      <string name="uploader_info_uploading">Uploading</string>
      <string name="uploader_btn_create_dir_text">Create directory for upload</string>
- 	<string name="file_list_empty">There are no files in this folder.\nNew files can be added with the \"Upload\" menu option.</string>
+     <string name="file_list_empty">There are no files in this folder.\nNew files can be added with the \"Upload\" menu option.</string>
      <string name="filedetails_select_file">Tap on a file to display additional information.</string>
      <string name="filedetails_size">Size:</string>
      <string name="filedetails_type">Type:</string>
@@@ -76,7 -72,7 +74,7 @@@
      <string name="filedetails_modified">Modified:</string>
      <string name="filedetails_download">Download</string>
      <string name="filedetails_sync_file">Refresh</string>
- 	<string name="filedetails_redownload">Redownload</string>
+     <string name="filedetails_redownload">Redownload</string>
      <string name="filedetails_open">Open</string>
      <string name="filedetails_renamed_in_upload_msg">File was renamed to %1$s during upload</string>
      <string name="common_yes">Yes</string>
@@@ -84,22 -80,18 +82,20 @@@
      <string name="common_ok">OK</string>
      <string name="common_cancel_download">Cancel download</string>
      <string name="common_cancel_upload">Cancel upload</string>
- 	<string name="common_cancel">Cancel</string>
+     <string name="common_cancel">Cancel</string>
      <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>
@@@ -111,73 -103,47 +107,69 @@@
      <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="foreign_files_local_text">"Local: %1$s"</string>
- 	<string name="foreign_files_remote_text">"Remote: %1$s"</string>
- 
- 	<string name="upload_query_move_foreign_files">There is not space enough to copy the selected files into the %1$s folder. Would like to move them into instead? </string>	
-     	
- 	<string name="use_ssl">Use Secure Connection</string>
+     <string name="foreign_files_remote_text">"Remote: %1$s"</string>
+     <string name="upload_query_move_foreign_files">There is not space enough to copy the selected files into the %1$s folder. Would like to move them into instead? </string>
+     <string name="use_ssl">Use Secure Connection</string>
      <string name="location_no_provider">%1$s cannot track your device. Please check your location settings</string>
-     
      <string name="pincode_enter_pin_code">Please, insert your App PIN</string>
      <string name="pincode_enter_new_pin_code">Please, insert your new App PIN</string>
      <string name="pincode_configure_your_pin">Enter your App PIN</string>
-     <string name="pincode_configure_your_pin_explanation">The PIN will be requested every time the app is started</string> 
+     <string name="pincode_configure_your_pin_explanation">The PIN will be requested every time the app is started</string>
      <string name="pincode_reenter_your_pincode">Please, reenter your App PIN</string>
      <string name="pincode_remove_your_pincode">Remove your App PIN</string>
-     <string name="pincode_mismatch">The App PINs are not the same</string> 
+     <string name="pincode_mismatch">The App PINs are not the same</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>
@@@ -196,51 -162,41 +188,41 @@@
      <string name="auth_incorrect_path_message">Application couldn\'t find a server instance at the given path. Please check your path and try again.</string>
      <string name="auth_timeout_title">The server took too long to respond</string>
      <string name="auth_incorrect_address_title">Malformed URL</string>
- 	<string name="auth_ssl_general_error_title">SSL initialization failed</string>
- 	<string name="auth_ssl_unverified_server_title">Unverified SSL server\'s identity</string>
- 	<string name="auth_bad_oc_version_title">Unrecognized server version</string>
- 	<string name="auth_wrong_connection_title">Couldn\'t establish connection</string>
- 	<string name="auth_secure_connection">Secure connection established</string>
+     <string name="auth_ssl_general_error_title">SSL initialization failed</string>
+     <string name="auth_ssl_unverified_server_title">Unverified SSL server\'s identity</string>
+     <string name="auth_bad_oc_version_title">Unrecognized server version</string>
+     <string name="auth_wrong_connection_title">Couldn\'t establish connection</string>
+     <string name="auth_secure_connection">Secure connection established</string>
      <string name="auth_login_details">Login details</string>
      <string name="auth_unauthorized">Invalid login / password</string>
      <string name="auth_not_found">Wrong path given</string>
      <string name="auth_internal">Internal server error, code %1$d</string>
-     
      <string name="crashlog_message">Application terminated unexpectedly. Would you like to submit a crash report?</string>
      <string name="crashlog_send_report">Send report</string>
      <string name="crashlog_dont_send_report">Don\'t send report</string>
-     
      <string name="extensions_avail_title">Extensions available!</string>
      <string name="extensions_avail_message">Looks like your server instance is supporting advanced extensions. Would you like to see extensions available for android ?</string>
      <string name="fd_keep_in_sync">Keep file up to date</string>
      <string name="common_share">Share</string>
      <string name="common_rename">Rename</string>
      <string name="common_remove">Remove</string>
-     
- 	  <string name="confirmation_remove_alert">"Do you really want to remove %1$s ?"</string>
- 	  <string name="confirmation_remove_folder_alert">"Do you really want to remove %1$s and its contents ?"</string>
- 	  <string name="confirmation_remove_local">Local only</string>
- 	  <string name="confirmation_remove_folder_local">Local contents only</string>
- 	  <string name="confirmation_remove_remote">Remove from server</string>
- 	  <string name="confirmation_remove_remote_and_local">Remote and local</string>
- 
+     <string name="confirmation_remove_alert">"Do you really want to remove %1$s ?"</string>
+     <string name="confirmation_remove_folder_alert">"Do you really want to remove %1$s and its contents ?"</string>
+     <string name="confirmation_remove_local">Local only</string>
+     <string name="confirmation_remove_folder_local">Local contents only</string>
+     <string name="confirmation_remove_remote">Remove from server</string>
+     <string name="confirmation_remove_remote_and_local">Remote and local</string>
      <string name="remove_success_msg">"Removal succeeded"</string>
      <string name="remove_fail_msg">"Removal failed"</string>
-     
      <string name="rename_dialog_title">Enter a new name</string>
      <string name="rename_local_fail_msg">"Local copy could not be renamed; try a different name"</string>
      <string name="rename_server_fail_msg">"Rename could not be completed"</string>
-         
-     <string name="sync_file_fail_msg">Remote file could not be checked</string> 
-     <string name="sync_file_nothing_to_do_msg">File contents already synchronized</string> 
-     
+     <string name="sync_file_fail_msg">Remote file could not be checked</string>
+     <string name="sync_file_nothing_to_do_msg">File contents already synchronized</string>
      <string name="create_dir_fail_msg">Directory could not be created</string>
-     
      <string name="wait_a_moment">Wait a moment</string>
- 	
      <string name="filedisplay_unexpected_bad_get_content">"Unexpected problem ; please select the file from a different app"</string>
      <string name="filedisplay_no_file_selected">No file was selected</string>
-     
      <string name="ssl_validator_title">Warning</string>
      <string name="ssl_validator_header">The identity of the site could not be verified</string>
      <string name="ssl_validator_reason_cert_not_trusted">- The server certificate is not trusted</string>
@@@ -256,37 -212,35 +238,46 @@@
      <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>
diff --combined src/com/owncloud/android/datamodel/DataStorageManager.java
index 83d69846,37753476..14b69c75
--- a/src/com/owncloud/android/datamodel/DataStorageManager.java
+++ b/src/com/owncloud/android/datamodel/DataStorageManager.java
@@@ -1,9 -1,10 +1,10 @@@
  /* 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 3 of the License, or
+  *   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,
@@@ -44,6 -45,4 +45,6 @@@ public interface DataStorageManager 
      public void removeDirectory(OCFile dir, boolean removeDBData, boolean removeLocalContent);
  
      public void moveDirectory(OCFile dir, String newPath);
 +
 +    public Vector<OCFile> getDirectoryImages(OCFile mParentFolder);
  }
diff --combined src/com/owncloud/android/datamodel/FileDataStorageManager.java
index 0cea0e0c,aa914c47..41aad01f
--- a/src/com/owncloud/android/datamodel/FileDataStorageManager.java
+++ b/src/com/owncloud/android/datamodel/FileDataStorageManager.java
@@@ -1,9 -1,10 +1,10 @@@
  /* 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 3 of the License, or
+  *   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,
@@@ -566,21 -567,4 +567,21 @@@ public class FileDataStorageManager imp
          }
      }
  
 +    @Override
 +    public Vector<OCFile> getDirectoryImages(OCFile directory) {
 +        Vector<OCFile> ret = new Vector<OCFile>(); 
 +        if (directory != null) {
 +            // TODO better implementation, filtering in the access to database (if possible) instead of here 
 +            Vector<OCFile> tmp = getDirectoryContent(directory);
 +            OCFile current = null; 
 +            for (int i=0; i<tmp.size(); i++) {
 +                current = tmp.get(i);
 +                if (current.isImage()) {
 +                    ret.add(current);
 +                }
 +            }
 +        }
 +        return ret;
 +    }
 +
  }
diff --combined src/com/owncloud/android/datamodel/OCFile.java
index 2ae09a50,668e9917..8b079961
--- a/src/com/owncloud/android/datamodel/OCFile.java
+++ b/src/com/owncloud/android/datamodel/OCFile.java
@@@ -1,9 -1,10 +1,10 @@@
  /* 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 3 of the License, or
+  *   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,
@@@ -20,12 -21,9 +21,12 @@@ package com.owncloud.android.datamodel
  
  import java.io.File;
  
 +import android.content.Intent;
 +import android.net.Uri;
  import android.os.Parcel;
  import android.os.Parcelable;
  import android.util.Log;
 +import android.webkit.MimeTypeMap;
  
  public class OCFile implements Parcelable, Comparable<OCFile> {
  
@@@ -457,30 -455,4 +458,30 @@@
          return 0;
      }
  
 +    /** @return  'True' if the file contains audio */
 +    public boolean isAudio() {
 +        return (mMimeType != null && mMimeType.startsWith("audio/"));
 +    }
 +
 +    /** @return  'True' if the file contains video */
 +    public boolean isVideo() {
 +        return (mMimeType != null && mMimeType.startsWith("video/"));
 +    }
 +
 +    /** @return  'True' if the file contains an image */
 +    public boolean isImage() {
 +        return ((mMimeType != null && mMimeType.startsWith("image/")) ||
 +                 getMimeTypeFromName().startsWith("image/"));
 +    }
 +    
 +    public String getMimeTypeFromName() {
 +        String extension = "";
 +        int pos = mRemotePath.lastIndexOf('.');
 +        if (pos >= 0) {
 +            extension = mRemotePath.substring(pos + 1);
 +        }
 +        String result = MimeTypeMap.getSingleton().getMimeTypeFromExtension(extension.toLowerCase());
 +        return (result != null) ? result : "";
 +    }
 +
  }
diff --combined src/com/owncloud/android/files/services/FileDownloader.java
index d8fa84bb,ac70e39a..aa5583d0
--- a/src/com/owncloud/android/files/services/FileDownloader.java
+++ b/src/com/owncloud/android/files/services/FileDownloader.java
@@@ -1,9 -1,10 +1,10 @@@
  /* 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 3 of the License, or
+  *   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,
@@@ -20,9 -21,7 +21,9 @@@ package com.owncloud.android.files.serv
  
  import java.io.File;
  import java.util.AbstractList;
 +import java.util.HashMap;
  import java.util.Iterator;
 +import java.util.Map;
  import java.util.Vector;
  import java.util.concurrent.ConcurrentHashMap;
  import java.util.concurrent.ConcurrentMap;
@@@ -36,8 -35,6 +37,8 @@@ import com.owncloud.android.operations.
  import com.owncloud.android.operations.RemoteOperationResult;
  import com.owncloud.android.ui.activity.FileDetailActivity;
  import com.owncloud.android.ui.fragment.FileDetailFragment;
 +import com.owncloud.android.ui.preview.PreviewImageActivity;
 +import com.owncloud.android.ui.preview.PreviewImageFragment;
  
  import android.accounts.Account;
  import android.app.Notification;
@@@ -55,7 -52,6 +56,7 @@@ import android.os.Process
  import android.util.Log;
  import android.widget.RemoteViews;
  
 +import com.owncloud.android.AccountUtils;
  import com.owncloud.android.R;
  import eu.alefzero.webdav.WebdavClient;
  
@@@ -140,7 -136,6 +141,7 @@@ public class FileDownloader extends Ser
              DownloadFileOperation newDownload = new DownloadFileOperation(account, file); 
              mPendingDownloads.putIfAbsent(downloadKey, newDownload);
              newDownload.addDatatransferProgressListener(this);
 +            newDownload.addDatatransferProgressListener((FileDownloaderBinder)mBinder);
              requestedDownloads.add(downloadKey);
              sendBroadcastNewDownload(newDownload);
              
@@@ -170,29 -165,13 +171,29 @@@
          return mBinder;
      }
  
 +
 +    /**
 +     * Called when ALL the bound clients were onbound.
 +     */
 +    @Override
 +    public boolean onUnbind(Intent intent) {
 +        ((FileDownloaderBinder)mBinder).clearListeners();
 +        return false;   // not accepting rebinding (default behaviour)
 +    }
 +
      
      /**
       *  Binder to let client components to perform operations on the queue of downloads.
       * 
       *  It provides by itself the available operations.
       */
 -    public class FileDownloaderBinder extends Binder {
 +    public class FileDownloaderBinder extends Binder implements OnDatatransferProgressListener {
 +        
 +        /** 
 +         * Map of listeners that will be reported about progress of downloads from a {@link FileDownloaderBinder} instance 
 +         */
 +        private Map<String, OnDatatransferProgressListener> mBoundListeners = new HashMap<String, OnDatatransferProgressListener>();
 +        
          
          /**
           * Cancels a pending or current download of a remote file.
@@@ -211,11 -190,6 +212,11 @@@
          }
          
          
 +        public void clearListeners() {
 +            mBoundListeners.clear();
 +        }
 +
 +
          /**
           * Returns True when the file described by 'file' in the ownCloud account 'account' is downloading or waiting to download.
           * 
@@@ -241,55 -215,6 +242,55 @@@
                  }
              }
          }
 +
 +        
 +        /**
 +         * Adds a listener interested in the progress of the download 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 download 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(mCurrentDownload.getAccount(), mCurrentDownload.getFile());
 +            OnDatatransferProgressListener boundListener = mBoundListeners.get(key);
 +            if (boundListener != null) {
 +                boundListener.onTransferProgress(progressRate, totalTransferredSoFar, totalToTransfer, fileName);
 +            }
 +        }
 +        
      }
      
      
@@@ -403,12 -328,7 +404,12 @@@
          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);
 +        Intent showDetailsIntent = null;
 +        if (PreviewImageFragment.canBePreviewed(download.getFile())) {
 +            showDetailsIntent = new Intent(this, PreviewImageActivity.class);
 +        } else {
 +            showDetailsIntent = new Intent(this, FileDetailActivity.class);
 +        }
          showDetailsIntent.putExtra(FileDetailFragment.EXTRA_FILE, download.getFile());
          showDetailsIntent.putExtra(FileDetailFragment.EXTRA_ACCOUNT, download.getAccount());
          showDetailsIntent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
@@@ -456,22 -376,8 +457,22 @@@
              int contentId = (downloadResult.isSuccess()) ? R.string.downloader_download_succeeded_content : R.string.downloader_download_failed_content;
              Notification finalNotification = new Notification(R.drawable.icon, getString(tickerId), System.currentTimeMillis());
              finalNotification.flags |= Notification.FLAG_AUTO_CANCEL;
 -            // TODO put something smart in the contentIntent below
 -            finalNotification.contentIntent = PendingIntent.getActivity(getApplicationContext(), (int)System.currentTimeMillis(), new Intent(), 0);
 +            Intent showDetailsIntent = null;
 +            if (downloadResult.isSuccess()) {
 +                if (PreviewImageFragment.canBePreviewed(download.getFile())) {
 +                    showDetailsIntent = new Intent(this, PreviewImageActivity.class);
 +                } else {
 +                    showDetailsIntent = new Intent(this, FileDetailActivity.class);
 +                }
 +                showDetailsIntent.putExtra(FileDetailFragment.EXTRA_FILE, download.getFile());
 +                showDetailsIntent.putExtra(FileDetailFragment.EXTRA_ACCOUNT, download.getAccount());
 +                showDetailsIntent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
 +                
 +            } else {
 +                // TODO put something smart in showDetailsIntent
 +                showDetailsIntent = new Intent();
 +            }
 +            finalNotification.contentIntent = PendingIntent.getActivity(getApplicationContext(), (int)System.currentTimeMillis(), showDetailsIntent, 0);
              finalNotification.setLatestEventInfo(getApplicationContext(), getString(tickerId), String.format(getString(contentId), new File(download.getSavePath()).getName()), finalNotification.contentIntent);
              mNotificationManager.notify(tickerId, finalNotification);
          }
@@@ -501,8 -407,8 +502,8 @@@
       */
      private void sendBroadcastNewDownload(DownloadFileOperation download) {
          Intent added = new Intent(DOWNLOAD_ADDED_MESSAGE);
 -        /*added.putExtra(ACCOUNT_NAME, download.getAccount().name);
 -        added.putExtra(EXTRA_REMOTE_PATH, download.getRemotePath());*/
 +        added.putExtra(ACCOUNT_NAME, download.getAccount().name);
 +        added.putExtra(EXTRA_REMOTE_PATH, download.getRemotePath());
          added.putExtra(EXTRA_FILE_PATH, download.getSavePath());
          sendStickyBroadcast(added);
      }
diff --combined src/com/owncloud/android/files/services/FileUploader.java
index e16d75ce,3de51b6e..330b793c
--- a/src/com/owncloud/android/files/services/FileUploader.java
+++ b/src/com/owncloud/android/files/services/FileUploader.java
@@@ -1,9 -1,10 +1,10 @@@
  /* 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 3 of the License, or
+  *   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,
@@@ -20,9 -21,7 +21,9 @@@ package com.owncloud.android.files.serv
  
  import java.io.File;
  import java.util.AbstractList;
 +import java.util.HashMap;
  import java.util.Iterator;
 +import java.util.Map;
  import java.util.Vector;
  import java.util.concurrent.ConcurrentHashMap;
  import java.util.concurrent.ConcurrentMap;
@@@ -31,26 -30,6 +32,6 @@@ import org.apache.http.HttpStatus
  import org.apache.jackrabbit.webdav.MultiStatus;
  import org.apache.jackrabbit.webdav.client.methods.PropFindMethod;
  
- import com.owncloud.android.authenticator.AccountAuthenticator;
- import com.owncloud.android.datamodel.FileDataStorageManager;
- import com.owncloud.android.datamodel.OCFile;
- import com.owncloud.android.files.InstantUploadBroadcastReceiver;
- import com.owncloud.android.operations.ChunkedUploadFileOperation;
- import com.owncloud.android.operations.RemoteOperationResult;
- import com.owncloud.android.operations.UploadFileOperation;
- import com.owncloud.android.operations.RemoteOperationResult.ResultCode;
- import com.owncloud.android.ui.activity.FileDetailActivity;
- 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.WebdavEntry;
- import eu.alefzero.webdav.WebdavUtils;
- 
- import com.owncloud.android.network.OwnCloudClientUtils;
- 
  import android.accounts.Account;
  import android.accounts.AccountManager;
  import android.app.Notification;
@@@ -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 {
  
@@@ -79,20 -77,20 +81,20 @@@
      public static final String EXTRA_REMOTE_PATH = "REMOTE_PATH";
      public static final String EXTRA_OLD_REMOTE_PATH = "OLD_REMOTE_PATH";
      public static final String EXTRA_OLD_FILE_PATH = "OLD_FILE_PATH";
-     public static final String ACCOUNT_NAME = "ACCOUNT_NAME";    
-     
+     public static final String ACCOUNT_NAME = "ACCOUNT_NAME";
+ 
      public static final String KEY_FILE = "FILE";
      public static final String KEY_LOCAL_FILE = "LOCAL_FILE";
      public static final String KEY_REMOTE_FILE = "REMOTE_FILE";
      public static final String KEY_MIME_TYPE = "MIME_TYPE";
  
      public static final String KEY_ACCOUNT = "ACCOUNT";
-     
+ 
      public static final String KEY_UPLOAD_TYPE = "UPLOAD_TYPE";
      public static final String KEY_FORCE_OVERWRITE = "KEY_FORCE_OVERWRITE";
      public static final String KEY_INSTANT_UPLOAD = "INSTANT_UPLOAD";
      public static final String KEY_LOCAL_BEHAVIOUR = "BEHAVIOUR";
-     
+ 
      public static final int LOCAL_BEHAVIOUR_COPY = 0;
      public static final int LOCAL_BEHAVIOUR_MOVE = 1;
      public static final int LOCAL_BEHAVIOUR_FORGET = 2;
@@@ -101,7 -99,7 +103,7 @@@
      public static final int UPLOAD_MULTIPLE_FILES = 1;
  
      private static final String TAG = FileUploader.class.getSimpleName();
-     
+ 
      private Looper mServiceLooper;
      private ServiceHandler mServiceHandler;
      private IBinder mBinder;
@@@ -111,18 -109,17 +113,17 @@@
  
      private ConcurrentMap<String, UploadFileOperation> mPendingUploads = new ConcurrentHashMap<String, UploadFileOperation>();
      private UploadFileOperation mCurrentUpload = null;
-     
+ 
      private NotificationManager mNotificationManager;
      private Notification mNotification;
      private int mLastPercent;
      private RemoteViews mDefaultNotificationContentView;
-     
-     
+ 
      /**
       * Builds a key for mPendingUploads from the account and file to upload
       * 
 -     * @param account Account where the file to download is stored
 -     * @param file File to download
 +     * @param account   Account where the file to upload is stored
 +     * @param file      File to upload
       */
      private String buildRemoteName(Account account, OCFile file) {
          return account.name + file.getRemotePath();
@@@ -132,44 -129,44 +133,44 @@@
          return account.name + remotePath;
      }
  
-     
      /**
       * Checks if an ownCloud server version should support chunked uploads.
       * 
-      * @param version   OwnCloud version instance corresponding to an ownCloud server.
-      * @return          'True' if the ownCloud server with version supports chunked uploads.
+      * @param version OwnCloud version instance corresponding to an ownCloud
+      *            server.
+      * @return 'True' if the ownCloud server with version supports chunked
+      *         uploads.
       */
      private static boolean chunkedUploadIsSupported(OwnCloudVersion version) {
          return (version != null && version.compareTo(OwnCloudVersion.owncloud_v4_5) >= 0);
      }
  
-     
- 
      /**
       * Service initialization
       */
      @Override
      public void onCreate() {
          super.onCreate();
+         Log.i(TAG, "mPendingUploads size:" + mPendingUploads.size());
          mNotificationManager = (NotificationManager) getSystemService(NOTIFICATION_SERVICE);
-         HandlerThread thread = new HandlerThread("FileUploaderThread",
-                 Process.THREAD_PRIORITY_BACKGROUND);
+         HandlerThread thread = new HandlerThread("FileUploaderThread", Process.THREAD_PRIORITY_BACKGROUND);
          thread.start();
          mServiceLooper = thread.getLooper();
          mServiceHandler = new ServiceHandler(mServiceLooper, this);
          mBinder = new FileUploaderBinder();
      }
  
-     
      /**
       * Entry point to add one or several files to the queue of uploads.
       * 
-      * New uploads are added calling to startService(), resulting in a call to this method. This ensures the service will keep on working 
-      * although the caller activity goes away.
+      * New uploads are added calling to startService(), resulting in a call to
+      * this method. This ensures the service will keep on working although the
+      * caller activity goes away.
       */
      @Override
      public int onStartCommand(Intent intent, int flags, int startId) {
-         if (!intent.hasExtra(KEY_ACCOUNT) || !intent.hasExtra(KEY_UPLOAD_TYPE) || !(intent.hasExtra(KEY_LOCAL_FILE) || intent.hasExtra(KEY_FILE))) {
+         if (!intent.hasExtra(KEY_ACCOUNT) || !intent.hasExtra(KEY_UPLOAD_TYPE)
+                 || !(intent.hasExtra(KEY_LOCAL_FILE) || intent.hasExtra(KEY_FILE))) {
              Log.e(TAG, "Not enough information provided in intent");
              return Service.START_NOT_STICKY;
          }
@@@ -179,25 -176,30 +180,30 @@@
              return Service.START_NOT_STICKY;
          }
          Account account = intent.getParcelableExtra(KEY_ACCOUNT);
-         
+ 
          String[] localPaths = null, remotePaths = null, mimeTypes = null;
          OCFile[] files = null;
          if (uploadType == UPLOAD_SINGLE_FILE) {
-             
+ 
              if (intent.hasExtra(KEY_FILE)) {
-                 files = new OCFile[] {intent.getParcelableExtra(KEY_FILE) };
-                 
+                 files = new OCFile[] { intent.getParcelableExtra(KEY_FILE) };
+ 
              } else {
                  localPaths = new String[] { intent.getStringExtra(KEY_LOCAL_FILE) };
                  remotePaths = new String[] { intent.getStringExtra(KEY_REMOTE_FILE) };
                  mimeTypes = new String[] { intent.getStringExtra(KEY_MIME_TYPE) };
              }
-             
+ 
          } else { // mUploadType == UPLOAD_MULTIPLE_FILES
-             
+ 
              if (intent.hasExtra(KEY_FILE)) {
-                 files = (OCFile[]) intent.getParcelableArrayExtra(KEY_FILE);    // TODO will this casting work fine?
-                 
+                 files = (OCFile[]) intent.getParcelableArrayExtra(KEY_FILE); // TODO
+                                                                              // will
+                                                                              // this
+                                                                              // casting
+                                                                              // work
+                                                                              // fine?
+ 
              } else {
                  localPaths = intent.getStringArrayExtra(KEY_LOCAL_FILE);
                  remotePaths = intent.getStringArrayExtra(KEY_REMOTE_FILE);
@@@ -206,19 -208,24 +212,24 @@@
          }
  
          FileDataStorageManager storageManager = new FileDataStorageManager(account, getContentResolver());
-         
+ 
          boolean forceOverwrite = intent.getBooleanExtra(KEY_FORCE_OVERWRITE, false);
          boolean isInstant = intent.getBooleanExtra(KEY_INSTANT_UPLOAD, false);
          int localAction = intent.getIntExtra(KEY_LOCAL_BEHAVIOUR, LOCAL_BEHAVIOUR_COPY);
          boolean fixed = false;
          if (isInstant) {
-             fixed = checkAndFixInstantUploadDirectory(storageManager);  // MUST be done BEFORE calling obtainNewOCFileToUpload
+             fixed = checkAndFixInstantUploadDirectory(storageManager); // MUST
+                                                                        // be
+                                                                        // done
+                                                                        // BEFORE
+                                                                        // calling
+                                                                        // obtainNewOCFileToUpload
          }
-         
+ 
          if (intent.hasExtra(KEY_FILE) && files == null) {
              Log.e(TAG, "Incorrect array for OCFiles provided in upload intent");
              return Service.START_NOT_STICKY;
-             
+ 
          } else if (!intent.hasExtra(KEY_FILE)) {
              if (localPaths == null) {
                  Log.e(TAG, "Incorrect array for local paths provided in upload intent");
@@@ -232,97 -239,90 +243,106 @@@
                  Log.e(TAG, "Different number of remote paths and local paths!");
                  return Service.START_NOT_STICKY;
              }
-             
+ 
              files = new OCFile[localPaths.length];
-             for (int i=0; i < localPaths.length; i++) {
-                 files[i] = obtainNewOCFileToUpload(remotePaths[i], localPaths[i], ((mimeTypes!=null)?mimeTypes[i]:(String)null), storageManager);
+             for (int i = 0; i < localPaths.length; i++) {
+                 files[i] = obtainNewOCFileToUpload(remotePaths[i], localPaths[i], ((mimeTypes != null) ? mimeTypes[i]
+                         : (String) null), storageManager);
+                 if (files[i] == null) {
+                     // TODO @andromaex add failure Notiification
+                     return Service.START_NOT_STICKY;
+                 }
              }
          }
-             
-         OwnCloudVersion ocv = new OwnCloudVersion(AccountManager.get(this).getUserData(account, AccountAuthenticator.KEY_OC_VERSION));
+ 
+         OwnCloudVersion ocv = new OwnCloudVersion(AccountManager.get(this).getUserData(account,
+                 AccountAuthenticator.KEY_OC_VERSION));
          boolean chunked = FileUploader.chunkedUploadIsSupported(ocv);
          AbstractList<String> requestedUploads = new Vector<String>();
          String uploadKey = null;
          UploadFileOperation newUpload = null;
          try {
-             for (int i=0; i < files.length; i++) {
+             for (int i = 0; i < files.length; i++) {
                  uploadKey = buildRemoteName(account, files[i].getRemotePath());
                  if (chunked) {
-                     newUpload = new ChunkedUploadFileOperation(account, files[i], isInstant, forceOverwrite, localAction);
+                     newUpload = new ChunkedUploadFileOperation(account, files[i], isInstant, forceOverwrite,
+                             localAction);
                  } else {
                      newUpload = new UploadFileOperation(account, files[i], isInstant, forceOverwrite, localAction);
                  }
-                 if (fixed && i==0) {
+                 if (fixed && i == 0) {
                      newUpload.setRemoteFolderToBeCreated();
                  }
                  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;
-             
+ 
          } catch (IllegalStateException e) {
              Log.e(TAG, "Bad information provided in intent: " + e.getMessage());
              return START_NOT_STICKY;
-             
+ 
          } catch (Exception e) {
              Log.e(TAG, "Unexpected exception while processing upload intent", e);
              return START_NOT_STICKY;
-             
+ 
          }
-         
+ 
          if (requestedUploads.size() > 0) {
              Message msg = mServiceHandler.obtainMessage();
              msg.arg1 = startId;
              msg.obj = requestedUploads;
              mServiceHandler.sendMessage(msg);
          }
- 
+         Log.i(TAG, "mPendingUploads size:" + mPendingUploads.size());
          return Service.START_NOT_STICKY;
      }
  
-     
      /**
-      * Provides a binder object that clients can use to perform operations on the queue of uploads, excepting the addition of new files. 
+      * Provides a binder object that clients can use to perform operations on
+      * the queue of uploads, excepting the addition of new files.
       * 
-      * Implemented to perform cancellation, pause and resume of existing uploads.
+      * Implemented to perform cancellation, pause and resume of existing
+      * uploads.
       */
      @Override
      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.
           * 
-          * @param account       Owncloud account where the remote file will be stored.
-          * @param file          A file in the queue of pending uploads
+          * @param account Owncloud account where the remote file will be stored.
+          * @param file A file in the queue of pending uploads
           */
          public void cancel(Account account, OCFile file) {
              UploadFileOperation upload = null;
@@@ -333,30 -333,24 +353,32 @@@
                  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()) {
 -                    // this can be slow if there are many downloads :(
 +                    // this can be slow if there are many uploads :(
                      Iterator<String> it = mPendingUploads.keySet().iterator();
                      boolean found = false;
                      while (it.hasNext() && !found) {
@@@ -368,68 -362,20 +390,69 @@@
                  }
              }
          }
 +
 +
 +        /**
 +         * 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)
@@@ -451,66 -397,66 +474,66 @@@
          }
      }
  
-     
-     
-     
      /**
       * Core upload method: sends the file(s) to upload
       * 
-      * @param uploadKey   Key to access the upload to perform, contained in mPendingUploads
+      * @param uploadKey Key to access the upload to perform, contained in
+      *            mPendingUploads
       */
      public void uploadFile(String uploadKey) {
  
-         synchronized(mPendingUploads) {
+         synchronized (mPendingUploads) {
              mCurrentUpload = mPendingUploads.get(uploadKey);
          }
-         
+ 
          if (mCurrentUpload != null) {
-             
+ 
              notifyUploadStart(mCurrentUpload);
  
-             
-             /// prepare client object to send requests to the ownCloud server
+             // / prepare client object to send requests to the ownCloud server
              if (mUploadClient == null || !mLastAccount.equals(mCurrentUpload.getAccount())) {
                  mLastAccount = mCurrentUpload.getAccount();
                  mStorageManager = new FileDataStorageManager(mLastAccount, getContentResolver());
                  mUploadClient = OwnCloudClientUtils.createOwnCloudClient(mLastAccount, getApplicationContext());
              }
-             
-             /// create remote folder for instant uploads
+ 
+             // / create remote folder for instant uploads
              if (mCurrentUpload.isRemoteFolderToBeCreated()) {
-                 mUploadClient.createDirectory(InstantUploadBroadcastReceiver.INSTANT_UPLOAD_DIR);    // ignoring result; fail could just mean that it already exists, but local database is not synchronized; the upload will be tried anyway
+                 mUploadClient.createDirectory(InstantUploadService.INSTANT_UPLOAD_DIR);
+                 // ignoring result fail could just mean that it already exists,
+                 // but local database is not synchronized the upload will be
+                 // tried anyway
              }
  
-             
-             /// perform the upload
+             // / perform the upload
              RemoteOperationResult uploadResult = null;
              try {
                  uploadResult = mCurrentUpload.execute(mUploadClient);
                  if (uploadResult.isSuccess()) {
                      saveUploadedFile();
                  }
-                 
+ 
              } finally {
-                 synchronized(mPendingUploads) {
+                 synchronized (mPendingUploads) {
                      mPendingUploads.remove(uploadKey);
+                     Log.i(TAG, "Remove CurrentUploadItem from pending upload Item Map.");
                  }
              }
-         
-             /// notify result
+ 
+             // notify result
              notifyUploadResult(uploadResult, mCurrentUpload);
-             
              sendFinalBroadcast(mCurrentUpload, uploadResult);
-             
+ 
          }
-         
+ 
      }
  
      /**
       * Saves a OC File after a successful upload.
       * 
-      * A PROPFIND is necessary to keep the props in the local database synchronized with the server, 
-      * specially the modification time and Etag (where available)
+      * A PROPFIND is necessary to keep the props in the local database
+      * synchronized with the server, specially the modification time and Etag
+      * (where available)
       * 
       * TODO refactor this ugly thing
       */
@@@ -518,94 -464,107 +541,106 @@@
          OCFile file = mCurrentUpload.getFile();
          long syncDate = System.currentTimeMillis();
          file.setLastSyncDateForData(syncDate);
-         
-         /// new PROPFIND to keep data consistent with server in theory, should return the same we already have
+ 
+         // / new PROPFIND to keep data consistent with server in theory, should
+         // return the same we already have
          PropFindMethod propfind = null;
          RemoteOperationResult result = null;
          try {
-           propfind = new PropFindMethod(mUploadClient.getBaseUri() + WebdavUtils.encodePath(mCurrentUpload.getRemotePath()));
-           int status = mUploadClient.executeMethod(propfind);
-           boolean isMultiStatus = (status == HttpStatus.SC_MULTI_STATUS);
-           if (isMultiStatus) {
-               MultiStatus resp = propfind.getResponseBodyAsMultiStatus();
-               WebdavEntry we = new WebdavEntry(resp.getResponses()[0],
-                                                mUploadClient.getBaseUri().getPath());
-               updateOCFile(file, we);
-               file.setLastSyncDateForProperties(syncDate);
-               
-           } else {
-               mUploadClient.exhaustResponse(propfind.getResponseBodyAsStream());
-           }
-           
-           result = new RemoteOperationResult(isMultiStatus, status);
-           Log.i(TAG, "Update: synchronizing properties for uploaded " + mCurrentUpload.getRemotePath() + ": " + result.getLogMessage());
-           
+             propfind = new PropFindMethod(mUploadClient.getBaseUri()
+                     + WebdavUtils.encodePath(mCurrentUpload.getRemotePath()));
+             int status = mUploadClient.executeMethod(propfind);
+             boolean isMultiStatus = (status == HttpStatus.SC_MULTI_STATUS);
+             if (isMultiStatus) {
+                 MultiStatus resp = propfind.getResponseBodyAsMultiStatus();
+                 WebdavEntry we = new WebdavEntry(resp.getResponses()[0], mUploadClient.getBaseUri().getPath());
+                 updateOCFile(file, we);
+                 file.setLastSyncDateForProperties(syncDate);
+ 
+             } else {
+                 mUploadClient.exhaustResponse(propfind.getResponseBodyAsStream());
+             }
+ 
+             result = new RemoteOperationResult(isMultiStatus, status);
+             Log.i(TAG, "Update: synchronizing properties for uploaded " + mCurrentUpload.getRemotePath() + ": "
+                     + result.getLogMessage());
+ 
          } catch (Exception e) {
              result = new RemoteOperationResult(e);
-             Log.e(TAG, "Update: synchronizing properties for uploaded " + mCurrentUpload.getRemotePath() + ": " + result.getLogMessage(), e);
+             Log.e(TAG, "Update: synchronizing properties for uploaded " + mCurrentUpload.getRemotePath() + ": "
+                     + result.getLogMessage(), e);
  
          } finally {
              if (propfind != null)
                  propfind.releaseConnection();
          }
  
-         /// maybe this would be better as part of UploadFileOperation... or maybe all this method
+         // / maybe this would be better as part of UploadFileOperation... or
+         // maybe all this method
          if (mCurrentUpload.wasRenamed()) {
              OCFile oldFile = mCurrentUpload.getOldFile();
              if (oldFile.fileExists()) {
                  oldFile.setStoragePath(null);
                  mStorageManager.saveFile(oldFile);
-                 
-             } // else: it was just an automatic renaming due to a name coincidence; nothing else is needed, the storagePath is right in the instance returned by mCurrentUpload.getFile()
+ 
+             } // else: it was just an automatic renaming due to a name
+               // coincidence; nothing else is needed, the storagePath is right
+               // in the instance returned by mCurrentUpload.getFile()
          }
-         
+ 
          mStorageManager.saveFile(file);
      }
  
-     
      private void updateOCFile(OCFile file, WebdavEntry we) {
          file.setCreationTimestamp(we.createTimestamp());
          file.setFileLength(we.contentLength());
          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;
      }
  
-     
-     private OCFile obtainNewOCFileToUpload(String remotePath, String localPath, String mimeType, FileDataStorageManager storageManager) {
+     private OCFile obtainNewOCFileToUpload(String remotePath, String localPath, String mimeType,
+             FileDataStorageManager storageManager) {
          OCFile newFile = new OCFile(remotePath);
          newFile.setStoragePath(localPath);
          newFile.setLastSyncDateForProperties(0);
          newFile.setLastSyncDateForData(0);
-         
+ 
          // size
          if (localPath != null && localPath.length() > 0) {
              File localFile = new File(localPath);
              newFile.setFileLength(localFile.length());
              newFile.setLastSyncDateForData(localFile.lastModified());
-         }   // don't worry about not assigning size, the problems with localPath are checked when the UploadFileOperation instance is created
-         
+         } // don't worry about not assigning size, the problems with localPath
+           // are checked when the UploadFileOperation instance is created
+ 
          // MIME type
          if (mimeType == null || mimeType.length() <= 0) {
              try {
-                 mimeType = MimeTypeMap.getSingleton()
-                     .getMimeTypeFromExtension(
-                             remotePath.substring(remotePath.lastIndexOf('.') + 1));
+                 mimeType = MimeTypeMap.getSingleton().getMimeTypeFromExtension(
+                         remotePath.substring(remotePath.lastIndexOf('.') + 1));
              } catch (IndexOutOfBoundsException e) {
                  Log.e(TAG, "Trying to find out MIME type of a file without extension: " + remotePath);
              }
@@@ -614,60 -573,62 +649,68 @@@
              mimeType = "application/octet-stream";
          }
          newFile.setMimetype(mimeType);
-         
+ 
          // parent dir
          String parentPath = new File(remotePath).getParent();
-         parentPath = parentPath.endsWith(OCFile.PATH_SEPARATOR) ? parentPath : parentPath + OCFile.PATH_SEPARATOR ;
+         parentPath = parentPath.endsWith(OCFile.PATH_SEPARATOR) ? parentPath : parentPath + OCFile.PATH_SEPARATOR;
          OCFile parentDir = storageManager.getFileByPath(parentPath);
          if (parentDir == null) {
-             throw new IllegalStateException("Can not upload a file to a non existing remote location: " + parentPath);
+             Toast t = Toast
+                     .makeText(
+                             getApplicationContext(),
+                             "The first time the InstantUpload is running you must be online, so the target folder can successfully created by the upload process",
+                             30);
+             t.show();
+             return null;
          }
          long parentDirId = parentDir.getFileId();
          newFile.setParentId(parentDirId);
          return newFile;
      }
-     
  
      /**
       * 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);
-         mNotification.contentIntent = PendingIntent.getActivity(getApplicationContext(), (int)System.currentTimeMillis(), showDetailsIntent, 0);
-         
+         mNotification.contentIntent = PendingIntent.getActivity(getApplicationContext(),
+                 (int) System.currentTimeMillis(), showDetailsIntent, 0);
+ 
          mNotificationManager.notify(R.string.uploader_upload_in_progress_ticker, mNotification);
      }
  
-     
      /**
       * Callback method to update the progress bar in the status notification
       */
      @Override
      public void onTransferProgress(long progressRate, long totalTransferredSoFar, long totalToTransfer, String fileName) {
-         int percent = (int)(100.0*((double)totalTransferredSoFar)/((double)totalToTransfer));
+         int percent = (int) (100.0 * ((double) totalTransferredSoFar) / ((double) totalToTransfer));
          if (percent != mLastPercent) {
              mNotification.contentView.setProgressBar(R.id.status_progress, 100, percent, false);
              String text = String.format(getString(R.string.uploader_upload_in_progress_content), percent, fileName);
@@@ -676,104 -637,135 +719,140 @@@
          }
          mLastPercent = percent;
      }
-     
-     
+ 
      /**
-      * Callback method to update the progress bar in the status notification  (old version)
+      * Callback method to update the progress bar in the status notification
+      * (old version)
       */
      @Override
      public void onTransferProgress(long progressRate) {
          // NOTHING TO DO HERE ANYMORE
      }
  
-     
      /**
       * 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);
-             mNotification.contentIntent = PendingIntent.getActivity(getApplicationContext(), (int)System.currentTimeMillis(), showDetailsIntent, 0);
-             
-             mNotification.setLatestEventInfo(   getApplicationContext(), 
-                                                 getString(R.string.uploader_upload_succeeded_ticker), 
-                                                 String.format(getString(R.string.uploader_upload_succeeded_content_single), upload.getFileName()), 
-                                                 mNotification.contentIntent);
-             
-             mNotificationManager.notify(R.string.uploader_upload_in_progress_ticker, mNotification);    // NOT AN ERROR; uploader_upload_in_progress_ticker is the target, not a new notification
-             
-             /* Notification about multiple uploads: pending of update
-             mNotification.setLatestEventInfo(   getApplicationContext(), 
-                                                     getString(R.string.uploader_upload_succeeded_ticker), 
-                                                     String.format(getString(R.string.uploader_upload_succeeded_content_multiple), mSuccessCounter), 
-                                                     mNotification.contentIntent);
-              */
-             
+             mNotification.contentIntent = PendingIntent.getActivity(getApplicationContext(),
+                     (int) System.currentTimeMillis(), showDetailsIntent, 0);
+ 
+             mNotification.setLatestEventInfo(getApplicationContext(),
+                     getString(R.string.uploader_upload_succeeded_ticker),
+                     String.format(getString(R.string.uploader_upload_succeeded_content_single), upload.getFileName()),
+                     mNotification.contentIntent);
+ 
+             mNotificationManager.notify(R.string.uploader_upload_in_progress_ticker, mNotification); // NOT
+                                                                                                      // AN
+             DbHandler db = new DbHandler(this.getBaseContext());
+             db.removeIUPendingFile(mCurrentUpload.getFile().getStoragePath());
+             db.close();
+ 
          } else {
-             /// fail -> explicit failure notification
+ 
+             // / fail -> explicit failure notification
              mNotificationManager.cancel(R.string.uploader_upload_in_progress_ticker);
-             Notification finalNotification = new Notification(R.drawable.icon, getString(R.string.uploader_upload_failed_ticker), System.currentTimeMillis());
+             Notification finalNotification = new Notification(R.drawable.icon,
+                     getString(R.string.uploader_upload_failed_ticker), System.currentTimeMillis());
              finalNotification.flags |= Notification.FLAG_AUTO_CANCEL;
-             // TODO put something smart in the contentIntent below
-             finalNotification.contentIntent = PendingIntent.getActivity(getApplicationContext(), (int)System.currentTimeMillis(), new Intent(), 0);
-             
-             String content = null; 
-             if (uploadResult.getCode() == ResultCode.LOCAL_STORAGE_FULL ||
-                 uploadResult.getCode() == ResultCode.LOCAL_STORAGE_NOT_COPIED) {
-                 // TODO we need a class to provide error messages for the users from a RemoteOperationResult and a RemoteOperation 
-                 content = String.format(getString(R.string.error__upload__local_file_not_copied), upload.getFileName(), getString(R.string.app_name));
+ 
+             String content = null;
+             if (uploadResult.getCode() == ResultCode.LOCAL_STORAGE_FULL
+                     || uploadResult.getCode() == ResultCode.LOCAL_STORAGE_NOT_COPIED) {
+                 // TODO we need a class to provide error messages for the users
+                 // from a RemoteOperationResult and a RemoteOperation
+                 content = String.format(getString(R.string.error__upload__local_file_not_copied), upload.getFileName(),
+                         getString(R.string.app_name));
+             } else if (uploadResult.getCode() == ResultCode.QUOTA_EXCEEDED) {
+                 content = getString(R.string.failed_upload_quota_exceeded_text);
              } else {
-                 content = String.format(getString(R.string.uploader_upload_failed_content_single), upload.getFileName());
+                 content = String
+                         .format(getString(R.string.uploader_upload_failed_content_single), upload.getFileName());
              }
-             finalNotification.setLatestEventInfo(   getApplicationContext(), 
-                                                     getString(R.string.uploader_upload_failed_ticker), 
-                                                     content, 
-                                                     finalNotification.contentIntent);
-             
+ 
+             // we add only for instant-uploads the InstantUploadActivity and the
+             // db entry
+             Intent detailUploadIntent = null;
+             if (upload.isInstant()) {
+                 detailUploadIntent = new Intent(this, InstantUploadActivity.class);
+                 detailUploadIntent.putExtra(FileUploader.KEY_ACCOUNT, upload.getAccount());
+             } else {
+                 detailUploadIntent = new Intent(this, FailedUploadActivity.class);
+                 detailUploadIntent.putExtra(FailedUploadActivity.MESSAGE, content);
+             }
+             finalNotification.contentIntent = PendingIntent.getActivity(getApplicationContext(),
+                     (int) System.currentTimeMillis(), detailUploadIntent, PendingIntent.FLAG_UPDATE_CURRENT
+                             | PendingIntent.FLAG_ONE_SHOT);
+ 
+             if (upload.isInstant()) {
+                 DbHandler db = null;
+                 try {
+                     db = new DbHandler(this.getBaseContext());
+                     String message = uploadResult.getLogMessage() + " errorCode: " + uploadResult.getCode();
+                     Log.e(TAG, message + " Http-Code: " + uploadResult.getHttpCode());
+                     if (uploadResult.getCode() == ResultCode.QUOTA_EXCEEDED) {
+                         message = getString(R.string.failed_upload_quota_exceeded_text);
+                     }
+                     if (db.updateFileState(upload.getOriginalStoragePath(), DbHandler.UPLOAD_STATUS_UPLOAD_FAILED,
+                             message) == 0) {
+                         db.putFileForLater(upload.getOriginalStoragePath(), upload.getAccount().name, message);
+                     }
+                 } finally {
+                     if (db != null) {
+                         db.close();
+                     }
+                 }
+             }
+             finalNotification.setLatestEventInfo(getApplicationContext(),
+                     getString(R.string.uploader_upload_failed_ticker), content, finalNotification.contentIntent);
+ 
              mNotificationManager.notify(R.string.uploader_upload_failed_ticker, finalNotification);
-             
-             /* Notification about multiple uploads failure: pending of update
-             finalNotification.setLatestEventInfo(   getApplicationContext(), 
-                                                         getString(R.string.uploader_upload_failed_ticker), 
-                                                         String.format(getString(R.string.uploader_upload_failed_content_multiple), mSuccessCounter, mTotalFilesToSend), 
-                                                         finalNotification.contentIntent);
-             } */                
          }
-         
+ 
      }
-     
-     
+ 
      /**
-      * Sends a broadcast in order to the interested activities can update their view
+      * Sends a broadcast in order to the interested activities can update their
+      * view
       * 
-      * @param upload          Finished upload operation
-      * @param uploadResult    Result of the upload operation
+      * @param upload Finished upload operation
+      * @param uploadResult Result of the upload operation
       */
      private void sendFinalBroadcast(UploadFileOperation upload, RemoteOperationResult uploadResult) {
          Intent end = new Intent(UPLOAD_FINISH_MESSAGE);
-         end.putExtra(EXTRA_REMOTE_PATH, upload.getRemotePath());    // real remote path, after possible automatic renaming
+         end.putExtra(EXTRA_REMOTE_PATH, upload.getRemotePath()); // real remote
+                                                                  // path, after
+                                                                  // possible
+                                                                  // automatic
+                                                                  // renaming
          if (upload.wasRenamed()) {
              end.putExtra(EXTRA_OLD_REMOTE_PATH, upload.getOldFile().getRemotePath());
          }
@@@ -783,5 -775,4 +862,4 @@@
          sendStickyBroadcast(end);
      }
  
- 
  }
diff --combined src/com/owncloud/android/operations/ChunkedUploadFileOperation.java
index 5e4b5913,c01ee46b..d421803a
--- a/src/com/owncloud/android/operations/ChunkedUploadFileOperation.java
+++ b/src/com/owncloud/android/operations/ChunkedUploadFileOperation.java
@@@ -1,9 -1,10 +1,10 @@@
  /* 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 3 of the License, or
+  *   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,
@@@ -28,7 -29,6 +29,7 @@@ import org.apache.commons.httpclient.Ht
  import org.apache.commons.httpclient.methods.PutMethod;
  
  import com.owncloud.android.datamodel.OCFile;
 +import com.owncloud.android.network.ProgressiveDataTransferer;
  
  import android.accounts.Account;
  import android.util.Log;
@@@ -62,16 -62,16 +63,16 @@@ public class ChunkedUploadFileOperatio
              File file = new File(getStoragePath());
              raf = new RandomAccessFile(file, "r");
              channel = raf.getChannel();
 -            ChunkFromFileChannelRequestEntity entity = new ChunkFromFileChannelRequestEntity(channel, getMimeType(), CHUNK_SIZE, file);
 -            entity.addOnDatatransferProgressListeners(getDataTransferListeners());
 +            mEntity = new ChunkFromFileChannelRequestEntity(channel, getMimeType(), CHUNK_SIZE, file);
 +            ((ProgressiveDataTransferer)mEntity).addDatatransferProgressListeners(getDataTransferListeners());
              long offset = 0;
              String uriPrefix = client.getBaseUri() + WebdavUtils.encodePath(getRemotePath()) + "-chunking-" + Math.abs((new Random()).nextInt(9000)+1000) + "-" ;
              long chunkCount = (long) Math.ceil((double)file.length() / CHUNK_SIZE);
              for (int chunkIndex = 0; chunkIndex < chunkCount ; chunkIndex++, offset += CHUNK_SIZE) {
                  mPutMethod = new PutMethod(uriPrefix + chunkCount + "-" + chunkIndex);
                  mPutMethod.addRequestHeader(OC_CHUNKED_HEADER, OC_CHUNKED_HEADER);
 -                entity.setOffset(offset);
 -                mPutMethod.setRequestEntity(entity);
 +                ((ChunkFromFileChannelRequestEntity)mEntity).setOffset(offset);
 +                mPutMethod.setRequestEntity(mEntity);
                  status = client.executeMethod(mPutMethod);
                  client.exhaustResponse(mPutMethod.getResponseBodyAsStream());
                  Log.d(TAG, "Upload of " + getStoragePath() + " to " + getRemotePath() + ", chunk index " + chunkIndex + ", count " + chunkCount + ", HTTP result status " + status);
diff --combined src/com/owncloud/android/operations/DownloadFileOperation.java
index 6a9d7b63,75bf9234..da6b2701
--- a/src/com/owncloud/android/operations/DownloadFileOperation.java
+++ b/src/com/owncloud/android/operations/DownloadFileOperation.java
@@@ -1,9 -1,9 +1,9 @@@
  /* 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 3 of the License, or
+  *   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,
@@@ -123,17 -123,9 +123,17 @@@ public class DownloadFileOperation exte
      
      
      public void addDatatransferProgressListener (OnDatatransferProgressListener listener) {
 -        mDataTransferListeners.add(listener);
 +        synchronized (mDataTransferListeners) {
 +            mDataTransferListeners.add(listener);
 +        }
      }
      
 +    public void removeDatatransferProgressListener(OnDatatransferProgressListener listener) {
 +        synchronized (mDataTransferListeners) {
 +            mDataTransferListeners.remove(listener);
 +        }
 +    }
 +
      @Override
      protected RemoteOperationResult run(WebdavClient client) {
          RemoteOperationResult result = null;
@@@ -198,11 -190,9 +198,11 @@@
                      }
                      fos.write(bytes, 0, readResult);
                      transferred += readResult;
 -                    it = mDataTransferListeners.iterator();
 -                    while (it.hasNext()) {
 -                        it.next().onTransferProgress(readResult, transferred, mFile.getFileLength(), targetFile.getName());
 +                    synchronized (mDataTransferListeners) {
 +                        it = mDataTransferListeners.iterator();
 +                        while (it.hasNext()) {
 +                            it.next().onTransferProgress(readResult, transferred, mFile.getFileLength(), targetFile.getName());
 +                        }
                      }
                  }
                  savedFile = true;
@@@ -231,5 -221,4 +231,5 @@@
          mCancellationRequested.set(true);   // atomic set; there is no need of synchronizing it
      }
  
 +
  }
diff --combined src/com/owncloud/android/operations/UploadFileOperation.java
index 55871eaf,5bf9cc06..0dfb72c3
--- a/src/com/owncloud/android/operations/UploadFileOperation.java
+++ b/src/com/owncloud/android/operations/UploadFileOperation.java
@@@ -1,9 -1,9 +1,9 @@@
  /* 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 3 of the License, or
+  *   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,
@@@ -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;
  
@@@ -45,8 -44,6 +48,6 @@@ import eu.alefzero.webdav.FileRequestEn
  import eu.alefzero.webdav.OnDatatransferProgressListener;
  import eu.alefzero.webdav.WebdavClient;
  import eu.alefzero.webdav.WebdavUtils;
- import android.accounts.Account;
- import android.util.Log;
  
  /**
   * Remote operation performing the upload of a file to an ownCloud server
@@@ -54,7 -51,7 +55,7 @@@
   * @author David A. Velasco
   */
  public class UploadFileOperation extends RemoteOperation {
-     
+ 
      private static final String TAG = UploadFileOperation.class.getSimpleName();
  
      private Account mAccount;
@@@ -72,22 -69,19 +73,25 @@@
      private Set<OnDatatransferProgressListener> mDataTransferListeners = new HashSet<OnDatatransferProgressListener>();
      private final AtomicBoolean mCancellationRequested = new AtomicBoolean(false);
  
 -    public UploadFileOperation(Account account, OCFile file, boolean isInstant, boolean forceOverwrite,
 -            int localBehaviour) {
 +    protected RequestEntity mEntity = null;
 +
 +    
 +    public UploadFileOperation( Account account,
 +                                OCFile file,
 +                                boolean isInstant, 
 +                                boolean forceOverwrite,
 +                                int localBehaviour) {
          if (account == null)
              throw new IllegalArgumentException("Illegal NULL account in UploadFileOperation creation");
          if (file == null)
              throw new IllegalArgumentException("Illegal NULL file in UploadFileOperation creation");
-         if (file.getStoragePath() == null || file.getStoragePath().length() <= 0 || !(new File(file.getStoragePath()).exists())) {
-             throw new IllegalArgumentException("Illegal file in UploadFileOperation; storage path invalid or file not found: " + file.getStoragePath());
+         if (file.getStoragePath() == null || file.getStoragePath().length() <= 0
+                 || !(new File(file.getStoragePath()).exists())) {
+             throw new IllegalArgumentException(
+                     "Illegal file in UploadFileOperation; storage path invalid or file not found: "
+                             + file.getStoragePath());
          }
-         
+ 
          mAccount = account;
          mFile = file;
          mRemotePath = file.getRemotePath();
@@@ -98,39 -92,38 +102,38 @@@
          mOriginalFileName = mFile.getFileName();
      }
  
- 
      public Account getAccount() {
          return mAccount;
      }
-     
+ 
      public String getFileName() {
          return mOriginalFileName;
      }
-     
+ 
      public OCFile getFile() {
          return mFile;
      }
-     
+ 
      public OCFile getOldFile() {
-         return mOldFile; 
+         return mOldFile;
      }
-     
+ 
      public String getOriginalStoragePath() {
          return mOriginalStoragePath;
      }
-     
+ 
      public String getStoragePath() {
          return mFile.getStoragePath();
      }
  
      public String getRemotePath() {
-         return mFile.getRemotePath(); 
+         return mFile.getRemotePath();
      }
  
      public String getMimeType() {
          return mFile.getMimetype();
      }
-     
+ 
      public boolean isInstant() {
          return mIsInstant;
      }
@@@ -138,7 -131,7 +141,7 @@@
      public boolean isRemoteFolderToBeCreated() {
          return mRemoteFolderToBeCreated;
      }
-     
+ 
      public void setRemoteFolderToBeCreated() {
          mRemoteFolderToBeCreated = true;
      }
@@@ -146,64 -139,60 +149,74 @@@
      public boolean getForceOverwrite() {
          return mForceOverwrite;
      }
-     
+ 
      public boolean wasRenamed() {
          return mWasRenamed;
      }
-     
+ 
      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;
          boolean localCopyPassed = false, nameCheckPassed = false;
          File temporalFile = null, originalFile = new File(mOriginalStoragePath), expectedFile = null;
          try {
-             /// rename the file to upload, if necessary
+             // / rename the file to upload, if necessary
              if (!mForceOverwrite) {
                  String remotePath = getAvailableRemotePath(client, mRemotePath);
                  mWasRenamed = !remotePath.equals(mRemotePath);
                  if (mWasRenamed) {
-                    createNewOCFile(remotePath);
+                     createNewOCFile(remotePath);
                  }
              }
              nameCheckPassed = true;
-         
-             String expectedPath = FileStorageUtils.getDefaultSavePathFor(mAccount.name, mFile);  /// not before getAvailableRemotePath() !!!
+ 
+             String expectedPath = FileStorageUtils.getDefaultSavePathFor(mAccount.name, mFile); // /
+                                                                                                 // not
+                                                                                                 // before
+                                                                                                 // getAvailableRemotePath()
+                                                                                                 // !!!
              expectedFile = new File(expectedPath);
-             
-             /// check location of local file; if not the expected, copy to a temporal file before upload (if COPY is the expected behaviour)
+ 
+             // / check location of local file; if not the expected, copy to a
+             // temporal file before upload (if COPY is the expected behaviour)
              if (!mOriginalStoragePath.equals(expectedPath) && mLocalBehaviour == FileUploader.LOCAL_BEHAVIOUR_COPY) {
  
                  if (FileStorageUtils.getUsableSpace(mAccount.name) < originalFile.length()) {
                      result = new RemoteOperationResult(ResultCode.LOCAL_STORAGE_FULL);
-                     return result;  // error condition when the file should be copied
-                         
+                     return result; // error condition when the file should be
+                                    // copied
+ 
                  } else {
                      String temporalPath = FileStorageUtils.getTemporalPath(mAccount.name) + mFile.getRemotePath();
                      mFile.setStoragePath(temporalPath);
                      temporalFile = new File(temporalPath);
-                     if (!mOriginalStoragePath.equals(temporalPath)) {   // preventing weird but possible situation
+                     if (!mOriginalStoragePath.equals(temporalPath)) { // preventing
+                                                                       // weird
+                                                                       // but
+                                                                       // possible
+                                                                       // situation
                          InputStream in = null;
                          OutputStream out = null;
                          try {
@@@ -215,38 -204,42 +228,42 @@@
                              temporalFile.createNewFile();
                              if (!temporalFile.isFile()) {
                                  throw new IOException("Unexpected error: target file could not be created");
-                             }                    
+                             }
                              in = new FileInputStream(originalFile);
                              out = new FileOutputStream(temporalFile);
                              byte[] buf = new byte[1024];
                              int len;
-                             while ((len = in.read(buf)) > 0){
+                             while ((len = in.read(buf)) > 0) {
                                  out.write(buf, 0, len);
                              }
-                             
+ 
                          } catch (Exception e) {
                              result = new RemoteOperationResult(ResultCode.LOCAL_STORAGE_NOT_COPIED);
                              return result;
-                             
+ 
                          } finally {
                              try {
-                                 if (in != null) in.close();
+                                 if (in != null)
+                                     in.close();
                              } catch (Exception e) {
-                                 Log.d(TAG, "Weird exception while closing input stream for " + mOriginalStoragePath + " (ignoring)", e);
+                                 Log.d(TAG, "Weird exception while closing input stream for " + mOriginalStoragePath
+                                         + " (ignoring)", e);
                              }
                              try {
-                                 if (out != null) out.close();
+                                 if (out != null)
+                                     out.close();
                              } catch (Exception e) {
-                                 Log.d(TAG, "Weird exception while closing output stream for " + expectedPath + " (ignoring)", e);
+                                 Log.d(TAG, "Weird exception while closing output stream for " + expectedPath
+                                         + " (ignoring)", e);
                              }
                          }
                      }
                  }
              }
              localCopyPassed = true;
-             
-             /// perform the upload
-             synchronized(mCancellationRequested) {
+ 
+             // / perform the upload
+             synchronized (mCancellationRequested) {
                  if (mCancellationRequested.get()) {
                      throw new OperationCancelledException();
                  } else {
@@@ -254,19 -247,21 +271,21 @@@
                  }
              }
              int status = uploadFile(client);
-             
-             
-             /// move local temporal file or original file to its corresponding location in the ownCloud local folder
+ 
+             // / move local temporal file or original file to its corresponding
+             // location in the ownCloud local folder
              if (isSuccess(status)) {
                  if (mLocalBehaviour == FileUploader.LOCAL_BEHAVIOUR_FORGET) {
                      mFile.setStoragePath(null);
-                     
+ 
                  } else {
                      mFile.setStoragePath(expectedPath);
                      File fileToMove = null;
-                     if (temporalFile != null) {             // FileUploader.LOCAL_BEHAVIOUR_COPY ; see where temporalFile was set
+                     if (temporalFile != null) { // FileUploader.LOCAL_BEHAVIOUR_COPY
+                                                 // ; see where temporalFile was
+                                                 // set
                          fileToMove = temporalFile;
-                     } else {                                // FileUploader.LOCAL_BEHAVIOUR_MOVE
+                     } else { // FileUploader.LOCAL_BEHAVIOUR_MOVE
                          fileToMove = originalFile;
                      }
                      if (!expectedFile.equals(fileToMove)) {
@@@ -274,18 -269,22 +293,22 @@@
                          expectedFolder.mkdirs();
                          if (!expectedFolder.isDirectory() || !fileToMove.renameTo(expectedFile)) {
                              mFile.setStoragePath(null); // forget the local file
-                             // by now, treat this as a success; the file was uploaded; the user won't like that the local file is not linked, but this should be a veeery rare fail;
-                             // the best option could be show a warning message (but not a fail)
-                             //result = new RemoteOperationResult(ResultCode.LOCAL_STORAGE_NOT_MOVED);
-                             //return result;
+                             // by now, treat this as a success; the file was
+                             // uploaded; the user won't like that the local file
+                             // is not linked, but this should be a very rare
+                             // fail;
+                             // the best option could be show a warning message
+                             // (but not a fail)
+                             // result = new
+                             // RemoteOperationResult(ResultCode.LOCAL_STORAGE_NOT_MOVED);
+                             // return result;
                          }
                      }
-                 } 
+                 }
              }
-             
+ 
              result = new RemoteOperationResult(isSuccess(status), status);
-             
-             
+ 
          } catch (Exception e) {
              // TODO something cleaner with cancellations
              if (mCancellationRequested.get()) {
@@@ -293,34 -292,36 +316,36 @@@
              } else {
                  result = new RemoteOperationResult(e);
              }
-             
-             
+ 
          } finally {
              if (temporalFile != null && !originalFile.equals(temporalFile)) {
                  temporalFile.delete();
              }
              if (result.isSuccess()) {
                  Log.i(TAG, "Upload of " + mOriginalStoragePath + " to " + mRemotePath + ": " + result.getLogMessage());
-                     
+ 
              } else {
                  if (result.getException() != null) {
                      String complement = "";
                      if (!nameCheckPassed) {
                          complement = " (while checking file existence in server)";
                      } else if (!localCopyPassed) {
-                         complement = " (while copying local file to " + FileStorageUtils.getSavePath(mAccount.name) + ")";
+                         complement = " (while copying local file to " + FileStorageUtils.getSavePath(mAccount.name)
+                                 + ")";
                      }
-                     Log.e(TAG, "Upload of " + mOriginalStoragePath + " to " + mRemotePath + ": " + result.getLogMessage() + complement, result.getException());
+                     Log.e(TAG,
+                             "Upload of " + mOriginalStoragePath + " to " + mRemotePath + ": " + result.getLogMessage()
+                                     + complement, result.getException());
                  } else {
-                     Log.e(TAG, "Upload of " + mOriginalStoragePath + " to " + mRemotePath + ": " + result.getLogMessage());
+                     Log.e(TAG,
+                             "Upload of " + mOriginalStoragePath + " to " + mRemotePath + ": " + result.getLogMessage());
                  }
              }
          }
-         
+ 
          return result;
      }
  
-     
      private void createNewOCFile(String newRemotePath) {
          // a new OCFile instance must be created for a new remote path
          OCFile newFile = new OCFile(newRemotePath);
@@@ -339,33 -340,30 +364,32 @@@
          mFile = newFile;
      }
  
- 
      public boolean isSuccess(int status) {
          return ((status == HttpStatus.SC_OK || status == HttpStatus.SC_CREATED || status == HttpStatus.SC_NO_CONTENT));
      }
-     
-     
+ 
      protected int uploadFile(WebdavClient client) throws HttpException, IOException, OperationCancelledException {
          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;
      }
-     
+ 
      /**
-      * Checks if remotePath does not exist in the server and returns it, or adds a suffix to it in order to avoid the server
-      * file is overwritten.
+      * Checks if remotePath does not exist in the server and returns it, or adds
+      * a suffix to it in order to avoid the server file is overwritten.
       * 
       * @param string
       * @return
@@@ -375,12 -373,12 +399,12 @@@
          if (!check) {
              return remotePath;
          }
-     
+ 
          int pos = remotePath.lastIndexOf(".");
          String suffix = "";
          String extension = "";
          if (pos >= 0) {
-             extension = remotePath.substring(pos+1);
+             extension = remotePath.substring(pos + 1);
              remotePath = remotePath.substring(0, pos);
          }
          int count = 2;
@@@ -393,21 -391,19 +417,19 @@@
              count++;
          } while (check);
  
-         if (pos >=0) {
+         if (pos >= 0) {
              return remotePath + suffix + "." + extension;
          } else {
              return remotePath + suffix;
          }
      }
  
- 
      public void cancel() {
-         synchronized(mCancellationRequested) {
+         synchronized (mCancellationRequested) {
              mCancellationRequested.set(true);
              if (mPutMethod != null)
                  mPutMethod.abort();
          }
      }
  
- 
  }
diff --combined src/com/owncloud/android/ui/activity/FileDetailActivity.java
index 46632d65,cd68c891..ba948d36
--- a/src/com/owncloud/android/ui/activity/FileDetailActivity.java
+++ b/src/com/owncloud/android/ui/activity/FileDetailActivity.java
@@@ -1,9 -1,10 +1,10 @@@
  /* 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 3 of the License, or
+  *   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,
@@@ -20,33 -21,26 +21,33 @@@ package com.owncloud.android.ui.activit
  import android.accounts.Account;
  import android.app.Dialog;
  import android.app.ProgressDialog;
 +import android.content.BroadcastReceiver;
  import android.content.ComponentName;
  import android.content.Context;
  import android.content.Intent;
 +import android.content.IntentFilter;
  import android.content.ServiceConnection;
  import android.content.res.Configuration;
  import android.os.Bundle;
  import android.os.IBinder;
 +import android.support.v4.app.Fragment;
  import android.support.v4.app.FragmentTransaction;
  import android.util.Log;
  
  import com.actionbarsherlock.app.ActionBar;
  import com.actionbarsherlock.app.SherlockFragmentActivity;
  import com.actionbarsherlock.view.MenuItem;
 +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.FileUploader;
  import com.owncloud.android.files.services.FileUploader.FileUploaderBinder;
  import com.owncloud.android.ui.fragment.FileDetailFragment;
 +import com.owncloud.android.ui.fragment.FileFragment;
 +import com.owncloud.android.ui.preview.PreviewMediaFragment;
  
 +import com.owncloud.android.AccountUtils;
  import com.owncloud.android.R;
  
  /**
@@@ -54,41 -48,24 +55,41 @@@
   * on.
   * 
   * @author Bartek Przybylski
 - * 
 + * @author David A. Velasco
   */
 -public class FileDetailActivity extends SherlockFragmentActivity implements FileDetailFragment.ContainerActivity {
 +public class FileDetailActivity extends SherlockFragmentActivity implements FileFragment.ContainerActivity {
      
      public static final int DIALOG_SHORT_WAIT = 0;
  
      public static final String TAG = FileDetailActivity.class.getSimpleName();
      
 +    public static final String EXTRA_MODE = "MODE";
 +    public static final int MODE_DETAILS = 0;
 +    public static final int MODE_PREVIEW = 1;
 +
 +    public static final String KEY_WAITING_TO_PREVIEW = "WAITING_TO_PREVIEW";
 +    
      private boolean mConfigurationChangedToLandscape = false;
      private FileDownloaderBinder mDownloaderBinder = null;
      private ServiceConnection mDownloadConnection, mUploadConnection = null;
      private FileUploaderBinder mUploaderBinder = null;
 +    private boolean mWaitingToPreview;
 +    
 +    private OCFile mFile;
 +    private Account mAccount;
  
 +    private FileDataStorageManager mStorageManager;
 +    private DownloadFinishReceiver mDownloadFinishReceiver;
 +    
  
      @Override
      protected void onCreate(Bundle savedInstanceState) {
          super.onCreate(savedInstanceState);
  
 +        mFile = getIntent().getParcelableExtra(FileDetailFragment.EXTRA_FILE);
 +        mAccount = getIntent().getParcelableExtra(FileDetailFragment.EXTRA_ACCOUNT);
 +        mStorageManager = new FileDataStorageManager(mAccount, getContentResolver());
 +        
          // check if configuration changed to large-land ; for a tablet being changed from portrait to landscape when in FileDetailActivity 
          Configuration conf = getResources().getConfiguration();
          mConfigurationChangedToLandscape = (conf.orientation == Configuration.ORIENTATION_LANDSCAPE && 
@@@ -96,23 -73,23 +97,23 @@@
                                             );
  
          if (!mConfigurationChangedToLandscape) {
 -            mDownloadConnection = new DetailsServiceConnection();
 -            bindService(new Intent(this, FileDownloader.class), mDownloadConnection, Context.BIND_AUTO_CREATE);
 -            mUploadConnection = new DetailsServiceConnection();
 -            bindService(new Intent(this, FileUploader.class), mUploadConnection, Context.BIND_AUTO_CREATE);
 -            
              setContentView(R.layout.file_activity_details);
          
              ActionBar actionBar = getSupportActionBar();
              actionBar.setDisplayHomeAsUpEnabled(true);
  
 -            OCFile file = getIntent().getParcelableExtra(FileDetailFragment.EXTRA_FILE);
 -            Account account = getIntent().getParcelableExtra(FileDetailFragment.EXTRA_ACCOUNT);
 -            FileDetailFragment mFileDetail = new FileDetailFragment(file, account);
 -        
 -            FragmentTransaction ft = getSupportFragmentManager().beginTransaction();
 -            ft.replace(R.id.fragment, mFileDetail, FileDetailFragment.FTAG);
 -            ft.commit();
 +            if (savedInstanceState == null) {
 +                mWaitingToPreview = false;
 +                createChildFragment();
 +            } else {
 +                mWaitingToPreview = savedInstanceState.getBoolean(KEY_WAITING_TO_PREVIEW);
 +            }
 +            
 +            mDownloadConnection = new DetailsServiceConnection();
 +            bindService(new Intent(this, FileDownloader.class), mDownloadConnection, Context.BIND_AUTO_CREATE);
 +            mUploadConnection = new DetailsServiceConnection();
 +            bindService(new Intent(this, FileUploader.class), mUploadConnection, Context.BIND_AUTO_CREATE);
 +            
              
          }  else {
              backToDisplayActivity();   // the 'back' won't be effective until this.onStart() and this.onResume() are completed;
@@@ -120,66 -97,6 +121,66 @@@
          
          
      }
 +
 +    /**
 +     * Creates the proper fragment depending upon the state of the handled {@link OCFile} and
 +     * the requested {@link Intent}.
 +     */
 +    private void createChildFragment() {
 +        int mode = getIntent().getIntExtra(EXTRA_MODE, MODE_PREVIEW); 
 +        
 +        Fragment newFragment = null;
 +        if (PreviewMediaFragment.canBePreviewed(mFile) && mode == MODE_PREVIEW) {
 +            if (mFile.isDown()) {
 +                newFragment = new PreviewMediaFragment(mFile, mAccount);
 +            
 +            } else {
 +                newFragment = new FileDetailFragment(mFile, mAccount);
 +                mWaitingToPreview = true;
 +            }
 +            
 +        } else {
 +            newFragment = new FileDetailFragment(mFile, mAccount);
 +        }
 +        FragmentTransaction ft = getSupportFragmentManager().beginTransaction();
 +        ft.replace(R.id.fragment, newFragment, FileDetailFragment.FTAG);
 +        ft.commit();
 +    }
 +    
 +
 +    @Override
 +    protected void onSaveInstanceState(Bundle outState) {
 +        super.onSaveInstanceState(outState);
 +        outState.putBoolean(KEY_WAITING_TO_PREVIEW, mWaitingToPreview);
 +    }
 +    
 +    
 +    @Override
 +    public void onPause() {
 +        super.onPause();
 +        if (mDownloadFinishReceiver != null) {
 +            unregisterReceiver(mDownloadFinishReceiver);
 +            mDownloadFinishReceiver = null;
 +        }
 +    }
 +    
 +    
 +    @Override
 +    public void onResume() {
 +        super.onResume();
 +        if (!mConfigurationChangedToLandscape) {
 +            // TODO this is probably unnecessary
 +            Fragment fragment = getSupportFragmentManager().findFragmentByTag(FileDetailFragment.FTAG);
 +            if (fragment != null && fragment instanceof FileDetailFragment) {
 +                ((FileDetailFragment) fragment).updateFileDetails(false, false);
 +            }
 +        }
 +        // Listen for download messages
 +        IntentFilter downloadIntentFilter = new IntentFilter(FileDownloader.DOWNLOAD_ADDED_MESSAGE);
 +        downloadIntentFilter.addAction(FileDownloader.DOWNLOAD_FINISH_MESSAGE);
 +        mDownloadFinishReceiver = new DownloadFinishReceiver();
 +        registerReceiver(mDownloadFinishReceiver, downloadIntentFilter);
 +    }
      
      
      /** Defines callbacks for service binding, passed to bindService() */
@@@ -187,27 -104,18 +188,27 @@@
  
          @Override
          public void onServiceConnected(ComponentName component, IBinder service) {
 +                
              if (component.equals(new ComponentName(FileDetailActivity.this, FileDownloader.class))) {
                  Log.d(TAG, "Download service connected");
                  mDownloaderBinder = (FileDownloaderBinder) service;
 +                if (mWaitingToPreview) {
 +                    requestForDownload();
 +                }
 +                    
              } else if (component.equals(new ComponentName(FileDetailActivity.this, FileUploader.class))) {
                  Log.d(TAG, "Upload service connected");
                  mUploaderBinder = (FileUploaderBinder) service;
              } else {
                  return;
              }
 -            FileDetailFragment fragment = (FileDetailFragment) getSupportFragmentManager().findFragmentByTag(FileDetailFragment.FTAG);
 -            if (fragment != null)
 -                fragment.updateFileDetails(false);   // let the fragment gets the mDownloadBinder through getDownloadBinder() (see FileDetailFragment#updateFileDetais())
 +            
 +            Fragment fragment = getSupportFragmentManager().findFragmentByTag(FileDetailFragment.FTAG);
 +            FileDetailFragment detailsFragment = (fragment instanceof FileDetailFragment) ? (FileDetailFragment) fragment : null;
 +            if (detailsFragment != null) {
 +                detailsFragment.listenForTransferProgress();
 +                detailsFragment.updateFileDetails(mWaitingToPreview, false);   // let the fragment gets the mDownloadBinder through getDownloadBinder() (see FileDetailFragment#updateFileDetais())
 +            }
          }
  
          @Override
@@@ -222,7 -130,7 +223,7 @@@
          }
      };    
      
 -
 +    
      @Override
      public void onDestroy() {
          super.onDestroy();
@@@ -255,15 -163,22 +256,15 @@@
  
  
  
 -    @Override
 -    protected void onResume() {
 -        
 -        super.onResume();
 -        if (!mConfigurationChangedToLandscape) { 
 -            FileDetailFragment fragment = (FileDetailFragment) getSupportFragmentManager().findFragmentByTag(FileDetailFragment.FTAG);
 -            fragment.updateFileDetails(false);
 -        }
 -    }
 -    
 -
      private void backToDisplayActivity() {
          Intent intent = new Intent(this, FileDisplayActivity.class);
          intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
 -        intent.putExtra(FileDetailFragment.EXTRA_FILE, getIntent().getParcelableExtra(FileDetailFragment.EXTRA_FILE));
 -        intent.putExtra(FileDetailFragment.EXTRA_ACCOUNT, getIntent().getParcelableExtra(FileDetailFragment.EXTRA_ACCOUNT));
 +        OCFile targetFile = null;
 +        if (mFile != null) {
 +            targetFile = mStorageManager.getFileById(mFile.getParentId());
 +        }
 +        intent.putExtra(FileDetailFragment.EXTRA_FILE, targetFile);
 +        intent.putExtra(FileDetailFragment.EXTRA_ACCOUNT, mAccount);
          startActivity(intent);
          finish();
      }
@@@ -311,84 -226,5 +312,84 @@@
      public FileUploaderBinder getFileUploaderBinder() {
          return mUploaderBinder;
      }
 +
 +
 +    @Override
 +    public void showFragmentWithDetails(OCFile file) {
 +        FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
 +        transaction.replace(R.id.fragment, new FileDetailFragment(file, mAccount), FileDetailFragment.FTAG); 
 +        transaction.commit();
 +    }
 +
 +    
 +    private void requestForDownload() {
 +        if (!mDownloaderBinder.isDownloading(mAccount, mFile)) {
 +            Intent i = new Intent(this, FileDownloader.class);
 +            i.putExtra(FileDownloader.EXTRA_ACCOUNT, mAccount);
 +            i.putExtra(FileDownloader.EXTRA_FILE, mFile);
 +            startService(i);
 +        }
 +    }
 +
      
 +    /**
 +     * Class waiting for broadcast events from the {@link FielDownloader} service.
 +     * 
 +     * Updates the UI when a download is started or finished, provided that it is relevant for the
 +     * current file.
 +     */
 +    private class DownloadFinishReceiver extends BroadcastReceiver {
 +        @Override
 +        public void onReceive(Context context, Intent intent) {
 +            boolean sameAccount = isSameAccount(context, intent);
 +            String downloadedRemotePath = intent.getStringExtra(FileDownloader.EXTRA_REMOTE_PATH);
 +            boolean samePath = (mFile != null && mFile.getRemotePath().equals(downloadedRemotePath));
 +            
 +            if (sameAccount && samePath) {
 +                updateChildFragment(intent.getAction(), downloadedRemotePath, intent.getBooleanExtra(FileDownloader.EXTRA_DOWNLOAD_RESULT, false));
 +            }
 +            
 +            removeStickyBroadcast(intent);
 +        }
 +
 +        private boolean isSameAccount(Context context, Intent intent) {
 +            String accountName = intent.getStringExtra(FileDownloader.ACCOUNT_NAME);
 +            return (accountName != null && accountName.equals(AccountUtils.getCurrentOwnCloudAccount(context).name));
 +        }
 +    }
 +
 +
 +    public void updateChildFragment(String downloadEvent, String downloadedRemotePath, boolean success) {
 +        Fragment fragment = getSupportFragmentManager().findFragmentByTag(FileDetailFragment.FTAG);
 +        if (fragment != null && fragment instanceof FileDetailFragment) {
 +            FileDetailFragment detailsFragment = (FileDetailFragment) fragment;
 +            OCFile fileInFragment = detailsFragment.getFile();
 +            if (fileInFragment != null && !downloadedRemotePath.equals(fileInFragment.getRemotePath())) {
 +                // this never should happen; fileInFragment should be always equals to mFile, that was compared to downloadedRemotePath in DownloadReceiver 
 +                mWaitingToPreview = false;
 +                
 +            } else if (downloadEvent.equals(FileDownloader.DOWNLOAD_ADDED_MESSAGE)) {
 +                // grants that the progress bar is updated
 +                detailsFragment.listenForTransferProgress();
 +                detailsFragment.updateFileDetails(true, false);
 +                
 +            } else if (downloadEvent.equals(FileDownloader.DOWNLOAD_FINISH_MESSAGE)) {
 +                //  refresh the details fragment 
 +                if (success && mWaitingToPreview) {
 +                    mFile = mStorageManager.getFileById(mFile.getFileId());   // update the file from database, for the local storage path
 +                    FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
 +                    transaction.replace(R.id.fragment, new PreviewMediaFragment(mFile, mAccount), FileDetailFragment.FTAG);
 +                    transaction.commit();
 +                    mWaitingToPreview = false;
 +                    
 +                } else {
 +                    detailsFragment.updateFileDetails(false, (success));
 +                    // TODO error message if !success ¿?
 +                }
 +            }
 +        } // TODO else if (fragment != null && fragment )
 +        
 +        
 +    }
 +
  }
diff --combined src/com/owncloud/android/ui/activity/FileDisplayActivity.java
index 97660e7d,46ed65e6..ca0ff010
--- a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
+++ b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
@@@ -1,1460 -1,1309 +1,1468 @@@
 -/* 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
 + *   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 3 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/>.
 + *
 + */
 +
 +package com.owncloud.android.ui.activity;
 +
 +import java.io.File;
 +
 +import android.accounts.Account;
 +import android.app.AlertDialog;
 +import android.app.ProgressDialog;
 +import android.app.AlertDialog.Builder;
 +import android.app.Dialog;
 +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.Fragment;
 +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.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.RemoveFileOperation;
 +import com.owncloud.android.operations.RenameFileOperation;
 +import com.owncloud.android.operations.SynchronizeFileOperation;
 +import com.owncloud.android.operations.RemoteOperationResult.ResultCode;
 +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.FileFragment;
 +import com.owncloud.android.ui.fragment.OCFileListFragment;
 +import com.owncloud.android.ui.preview.PreviewImageActivity;
 +import com.owncloud.android.ui.preview.PreviewImageFragment;
 +import com.owncloud.android.ui.preview.PreviewMediaFragment;
 +
 +import com.owncloud.android.R;
 +import eu.alefzero.webdav.WebdavClient;
 +
 +/**
 + * Displays, what files the user has available in his ownCloud.
 + * 
 + * @author Bartek Przybylski
 + * @author David A. Velasco
 + */
 +
 +public class FileDisplayActivity extends SherlockFragmentActivity implements
 +    OCFileListFragment.ContainerActivity, FileFragment.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 String TAG = "FileDisplayActivity";
 +
 +    private static int[] mMenuIdentifiersToPatch = {R.id.action_about_app};
 +    
 +    private OCFile mWaitingToPreview;
 +    private Handler mHandler;
 +
 +    
 +    @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);
 +            mWaitingToPreview = (OCFile) savedInstanceState.getParcelable(FileDetailActivity.KEY_WAITING_TO_PREVIEW);
 +
 +        } else {
 +            mWaitingToPreview = null;
 +        }
 +        
 +        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();
 +        } else {
 +            // quick patchES to fix problem in turn from landscape to portrait, when a file is selected in the right pane
 +            // TODO serious refactorization in activities and fragments providing file browsing and handling 
 +            if (mCurrentFile != null) {
 +                onFileClick(mCurrentFile);
 +                mCurrentFile = null;
 +            }
 +            Fragment rightPanel = getSupportFragmentManager().findFragmentByTag(FileDetailFragment.FTAG);
 +            if (rightPanel != null) {
 +                FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
 +                transaction.remove(rightPanel);
 +                transaction.commit();
 +            }
 +        }
 +            
 +        // 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) {
 +                if (PreviewMediaFragment.canBePreviewed(mCurrentFile)) {
 +                    if (mCurrentFile.isDown()) {
 +                        transaction.replace(R.id.file_details_container, new PreviewMediaFragment(mCurrentFile, AccountUtils.getCurrentOwnCloudAccount(this)), FileDetailFragment.FTAG);
 +                    } else {
 +                        transaction.replace(R.id.file_details_container, new FileDetailFragment(mCurrentFile, AccountUtils.getCurrentOwnCloudAccount(this)), FileDetailFragment.FTAG);
 +                        mWaitingToPreview = mCurrentFile;
 +                    }
 +                } else {
 +                    transaction.replace(R.id.file_details_container, new FileDetailFragment(mCurrentFile, AccountUtils.getCurrentOwnCloudAccount(this)), FileDetailFragment.FTAG);
 +                }
 +                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.main_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.action_create_dir: {
 +                showDialog(DIALOG_CREATE_DIR);
 +                break;
 +            }
 +            case R.id.action_sync_account: {
 +                startSynchronization();
 +                break;
 +            }
 +            case R.id.action_upload: {
 +                showDialog(DIALOG_CHOOSE_UPLOAD_SOURCE);
 +                break;
 +            }
 +            case R.id.action_settings: {
 +                Intent settingsIntent = new Intent(this, Preferences.class);
 +                startActivity(settingsIntent);
 +                break;
 +            }
 +            case R.id.action_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
 +            Fragment fileFragment = getSupportFragmentManager().findFragmentByTag(FileDetailFragment.FTAG);
 +            if (fileFragment != null && (fileFragment instanceof PreviewMediaFragment || !((FileDetailFragment) fileFragment).isEmpty())) {
 +                FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
 +                transaction.replace(R.id.file_details_container, new FileDetailFragment(null, null), FileDetailFragment.FTAG); // empty FileDetailFragment                
 +                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) {
 +            FileFragment fragment = (FileFragment) getSupportFragmentManager().findFragmentByTag(FileDetailFragment.FTAG);
 +            if (fragment != null) {
 +                OCFile file = fragment.getFile();
 +                if (file != null) {
 +                    outState.putParcelable(FileDetailFragment.EXTRA_FILE, file);
 +                }
 +            }
 +        }
 +        outState.putParcelable(FileDetailActivity.KEY_WAITING_TO_PREVIEW, mWaitingToPreview);
 +        Log.d(getClass().toString(), "onSaveInstanceState() end");
 +    }
 +
 +    @Override
 +    public 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_ADDED_MESSAGE);
 +            downloadIntentFilter.addAction(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
 +    public 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) }; 
++            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
-                         //}
++                        // 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 = 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();
 +                }
 +            }
 +        }
 +        
 +    }
 +    
 +    
 +    /**
 +     * Class waiting for broadcast events from the {@link FielDownloader} service.
 +     * 
 +     * Updates the UI when a download is started or finished, provided that it is relevant for the
 +     * current folder.
 +     */
 +    private class DownloadFinishReceiver extends BroadcastReceiver {
 +        @Override
 +        public void onReceive(Context context, Intent intent) {
 +            boolean sameAccount = isSameAccount(context, intent);
 +            String downloadedRemotePath = intent.getStringExtra(FileDownloader.EXTRA_REMOTE_PATH);
 +            boolean isDescendant = isDescendant(downloadedRemotePath);
 +            
 +            if (sameAccount && isDescendant) {
 +                updateLeftPanel();
 +                if (mDualPane) {
 +                    updateRightPanel(intent.getAction(), downloadedRemotePath, intent.getBooleanExtra(FileDownloader.EXTRA_DOWNLOAD_RESULT, false));
 +                }
 +            }
 +            
 +            removeStickyBroadcast(intent);
 +        }
 +
 +        private boolean isDescendant(String downloadedRemotePath) {
 +            return (mCurrentDir != null && downloadedRemotePath != null && downloadedRemotePath.startsWith(mCurrentDir.getRemotePath()));
 +        }
 +
 +        private boolean isSameAccount(Context context, Intent intent) {
 +            String accountName = intent.getStringExtra(FileDownloader.ACCOUNT_NAME);
 +            return (accountName != null && accountName.equals(AccountUtils.getCurrentOwnCloudAccount(context).name));
 +        }
 +    }
 +    
 +    
 +    protected void updateLeftPanel() {
 +        OCFileListFragment fileListFragment = (OCFileListFragment) getSupportFragmentManager().findFragmentById(R.id.fileList);
 +        if (fileListFragment != null) { 
 +            fileListFragment.listDirectory();
 +        }
 +    }
 +
 +    protected void updateRightPanel(String downloadEvent, String downloadedRemotePath, boolean success) {
 +        Fragment fragment = getSupportFragmentManager().findFragmentByTag(FileDetailFragment.FTAG);
 +        boolean waitedPreview = (mWaitingToPreview != null && mWaitingToPreview.getRemotePath().equals(downloadedRemotePath));
 +        if (fragment != null && fragment instanceof FileDetailFragment) {
 +            FileDetailFragment detailsFragment = (FileDetailFragment) fragment;
 +            OCFile fileInFragment = detailsFragment.getFile();
 +            if (fileInFragment != null && !downloadedRemotePath.equals(fileInFragment.getRemotePath())) {
 +                // the user browsed to other file ; forget the automatic preview 
 +                mWaitingToPreview = null;
 +                
 +            } else if (downloadEvent.equals(FileDownloader.DOWNLOAD_ADDED_MESSAGE)) {
 +                // grant that the right panel updates the progress bar
 +                detailsFragment.listenForTransferProgress();
 +                detailsFragment.updateFileDetails(true, false);
 +                
 +            } else if (downloadEvent.equals(FileDownloader.DOWNLOAD_FINISH_MESSAGE)) {
 +                //  update the right panel 
 +                if (success && waitedPreview) {
 +                    mWaitingToPreview = mStorageManager.getFileById(mWaitingToPreview.getFileId());   // update the file from database, for the local storage path
 +                    FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
 +                    transaction.replace(R.id.file_details_container, new PreviewMediaFragment(mWaitingToPreview, AccountUtils.getCurrentOwnCloudAccount(this)), FileDetailFragment.FTAG);
 +                    transaction.commit();
 +                    mWaitingToPreview = null;
 +                    
 +                } else {
 +                    detailsFragment.updateFileDetails(false, (success));
 +                }
 +            }
 +        }
 +    }
 +
 +
 +    /**
 +     * {@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
 +            Fragment fileFragment = getSupportFragmentManager().findFragmentByTag(FileDetailFragment.FTAG);
 +            if (fileFragment != null && (fileFragment instanceof PreviewMediaFragment || !((FileDetailFragment) fileFragment).isEmpty())) {
 +                FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
 +                transaction.replace(R.id.file_details_container, new FileDetailFragment(null, null), FileDetailFragment.FTAG); // empty FileDetailFragment                
 +                transaction.commit();
 +            }
 +        }
 +    }
 +    
 +    
 +    /**
 +     * {@inheritDoc}
 +     */
 +    @Override
 +    public void onFileClick(OCFile file) {
 +        if (file != null && PreviewImageFragment.canBePreviewed(file)) {
 +            // preview image - it handles the download, if needed
 +            startPreviewImage(file);
 +            
 +        } else if (file != null && PreviewMediaFragment.canBePreviewed(file)) {
 +            if (file.isDown()) {
 +                // general preview
 +                startMediaPreview(file);
 +                
 +            } else {
 +                // automatic download, preview on finish
 +                startDownloadForPreview(file);
 +                
 +            }
 +        } else {
 +            // details view
 +            startDetails(file);
 +        }
 +    }
 +
 +    private void startPreviewImage(OCFile file) {
 +        Intent showDetailsIntent = new Intent(this, PreviewImageActivity.class);
 +        showDetailsIntent.putExtra(FileDetailFragment.EXTRA_FILE, file);
 +        showDetailsIntent.putExtra(FileDetailFragment.EXTRA_ACCOUNT, AccountUtils.getCurrentOwnCloudAccount(this));
 +        startActivity(showDetailsIntent);
 +    }
 +    
 +    private void startMediaPreview(OCFile file) {
 +        if (mDualPane) {
 +            FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
 +            transaction.replace(R.id.file_details_container, new PreviewMediaFragment(file, AccountUtils.getCurrentOwnCloudAccount(this)), FileDetailFragment.FTAG);
 +            transaction.commit();
 +            
 +        } else {
 +            Intent showDetailsIntent = new Intent(this, FileDetailActivity.class);
 +            showDetailsIntent.putExtra(FileDetailFragment.EXTRA_FILE, file);
 +            showDetailsIntent.putExtra(FileDetailFragment.EXTRA_ACCOUNT, AccountUtils.getCurrentOwnCloudAccount(this));
 +            startActivity(showDetailsIntent);
 +        }
 +    }
 +    
 +    private void startDownloadForPreview(OCFile file) {
 +        if (mDualPane) {
 +            FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
 +            transaction.replace(R.id.file_details_container, new FileDetailFragment(file, AccountUtils.getCurrentOwnCloudAccount(this)), FileDetailFragment.FTAG);
 +            transaction.commit();
 +            mWaitingToPreview = file;
 +            requestForDownload();
 +            
 +        } else {
 +            Intent showDetailsIntent = new Intent(this, FileDetailActivity.class);
 +            showDetailsIntent.putExtra(FileDetailFragment.EXTRA_FILE, file);
 +            showDetailsIntent.putExtra(FileDetailFragment.EXTRA_ACCOUNT, AccountUtils.getCurrentOwnCloudAccount(this));
 +            startActivity(showDetailsIntent);
 +        }
 +    }
 +
 +    
 +    private void startDetails(OCFile file) {
 +        if (mDualPane && !file.isImage()) {
 +            FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
 +            transaction.replace(R.id.file_details_container, new FileDetailFragment(file, AccountUtils.getCurrentOwnCloudAccount(this)), FileDetailFragment.FTAG);
 +            transaction.commit();
 +        } else {
 +            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;
 +                if (mWaitingToPreview != null) {
 +                    requestForDownload();
 +                }
 +                
 +            } 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) {
 +                Fragment fragment = getSupportFragmentManager().findFragmentByTag(FileDetailFragment.FTAG);
 +                if (fragment != null && fragment instanceof FileDetailFragment) {
 +                    FileDetailFragment detailFragment = (FileDetailFragment)fragment;
 +                    detailFragment.listenForTransferProgress();
 +                    detailFragment.updateFileDetails(false, 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) {
 +                FileFragment details = (FileFragment) getSupportFragmentManager().findFragmentByTag(FileDetailFragment.FTAG);
 +                if (details != null && removedFile.equals(details.getFile())) {
 +                    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) {
 +                FileFragment details = (FileFragment) getSupportFragmentManager().findFragmentByTag(FileDetailFragment.FTAG);
 +                if (details != null && details instanceof FileDetailFragment && renamedFile.equals(details.getFile()) ) {
 +                    ((FileDetailFragment) 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) {
 +            FileFragment details = (FileFragment) getSupportFragmentManager().findFragmentByTag(FileDetailFragment.FTAG);
 +            if (details != null && details instanceof FileDetailFragment && file.equals(details.getFile()) ) {
 +                if (downloading || uploading) {
 +                    ((FileDetailFragment)details).updateFileDetails(file, AccountUtils.getCurrentOwnCloudAccount(this));
 +                } else {
 +                    ((FileDetailFragment)details).updateFileDetails(false, true);
 +                }
 +            }
 +        }
 +    }
 +
 +
 +    @Override
 +    public void showFragmentWithDetails(OCFile file) {
 +        if (mDualPane) {
 +            FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
 +            transaction.replace(R.id.file_details_container, new FileDetailFragment(file, AccountUtils.getCurrentOwnCloudAccount(this)), FileDetailFragment.FTAG); 
 +            transaction.commit();
 +            
 +        } else {
 +            Intent showDetailsIntent = new Intent(this, FileDetailActivity.class);
 +            showDetailsIntent.putExtra(FileDetailFragment.EXTRA_FILE, file);
 +            showDetailsIntent.putExtra(FileDetailFragment.EXTRA_ACCOUNT, AccountUtils.getCurrentOwnCloudAccount(this));
 +            showDetailsIntent.putExtra(FileDetailActivity.EXTRA_MODE, FileDetailActivity.MODE_DETAILS);
 +            startActivity(showDetailsIntent);
 +        }
 +    }
 +
 +
 +    private void requestForDownload() {
 +        Account account = AccountUtils.getCurrentOwnCloudAccount(this);
 +        if (!mDownloaderBinder.isDownloading(account, mWaitingToPreview)) {
 +            Intent i = new Intent(this, FileDownloader.class);
 +            i.putExtra(FileDownloader.EXTRA_ACCOUNT, account);
 +            i.putExtra(FileDownloader.EXTRA_FILE, mWaitingToPreview);
 +            startService(i);
 +        }
 +    }
 +
 +    
 +}
+ 
 -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);
 -                }
 -            }
 -        }
 -    }
 -
 -
 -    
 -
 -
 -}
diff --combined src/com/owncloud/android/ui/activity/UploadFilesActivity.java
index ed6e7fa7,a6d61d18..d16b2637
--- a/src/com/owncloud/android/ui/activity/UploadFilesActivity.java
+++ b/src/com/owncloud/android/ui/activity/UploadFilesActivity.java
@@@ -1,9 -1,9 +1,9 @@@
  /* 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 3 of the License, or
+  *   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,
@@@ -347,7 -347,8 +347,7 @@@ public class UploadFilesActivity extend
                  String[] args = {getString(R.string.app_name)};
                  ConfirmationDialogFragment dialog = ConfirmationDialogFragment.newInstance(R.string.upload_query_move_foreign_files, args, R.string.common_yes, -1, R.string.common_no);
                  dialog.setOnConfirmationListener(UploadFilesActivity.this);
 -                mCurrentDialog = dialog;
 -                mCurrentDialog.show(getSupportFragmentManager(), QUERY_TO_MOVE_DIALOG_TAG);
 +                dialog.show(getSupportFragmentManager(), QUERY_TO_MOVE_DIALOG_TAG);
              }
          }
      }
@@@ -362,12 -363,16 +362,12 @@@
              setResult(RESULT_OK_AND_MOVE, data);
              finish();
          }
 -        mCurrentDialog.dismiss();
 -        mCurrentDialog = null;
      }
  
  
      @Override
      public void onNeutral(String callerTag) {
          Log.d(TAG, "Phantom neutral button in dialog was clicked; dialog tag is " + callerTag);
 -        mCurrentDialog.dismiss();
 -        mCurrentDialog = null;
      }
  
  
@@@ -375,6 -380,8 +375,6 @@@
      public void onCancel(String callerTag) {
          /// nothing to do; don't finish, let the user change the selection
          Log.d(TAG, "Negative button in dialog was clicked; dialog tag is " + callerTag);
 -        mCurrentDialog.dismiss();
 -        mCurrentDialog = null;
      }    
  
      
diff --combined src/com/owncloud/android/ui/dialog/IndeterminateProgressDialog.java
index ab7d0558,c7796232..314b6060
--- a/src/com/owncloud/android/ui/dialog/IndeterminateProgressDialog.java
+++ b/src/com/owncloud/android/ui/dialog/IndeterminateProgressDialog.java
@@@ -1,3 -1,21 +1,21 @@@
+ /* ownCloud Android client application
+  *   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/>.
+  *
+  */
+ 
  package com.owncloud.android.ui.dialog;
  
  import android.app.Dialog;
@@@ -43,7 -61,7 +61,7 @@@ public class IndeterminateProgressDialo
          dialog.setIndeterminate(true);
          
          /// set message
 -        int messageId = getArguments().getInt(ARG_MESSAGE_ID, R.string.text_placeholder);
 +        int messageId = getArguments().getInt(ARG_MESSAGE_ID, R.string.placeholder_sentence);
          dialog.setMessage(getString(messageId));
          
          /// set cancellation behavior
diff --combined src/com/owncloud/android/ui/fragment/ConfirmationDialogFragment.java
index 42d1e622,e527d31e..7a59bd65
--- a/src/com/owncloud/android/ui/fragment/ConfirmationDialogFragment.java
+++ b/src/com/owncloud/android/ui/fragment/ConfirmationDialogFragment.java
@@@ -1,9 -1,10 +1,10 @@@
  /* 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 3 of the License, or
+  *   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,
@@@ -35,8 -36,6 +36,8 @@@ public class ConfirmationDialogFragmen
      public final static String ARG_NEUTRAL_BTN_RES = "neutral_btn_res";
      public final static String ARG_NEGATIVE_BTN_RES = "negative_btn_res";
      
 +    public static final String FTAG_CONFIRMATION = "CONFIRMATION_FRAGMENT";
 +
      private ConfirmationDialogFragmentListener mListener;
      
      /**
@@@ -91,7 -90,6 +92,7 @@@
                      new DialogInterface.OnClickListener() {
                          public void onClick(DialogInterface dialog, int whichButton) {
                              mListener.onConfirmation(getTag()); 
 +                            dialog.dismiss();
                          }
                      });
          if (neuBtn != -1)
@@@ -99,7 -97,6 +100,7 @@@
                      new DialogInterface.OnClickListener() {
                          public void onClick(DialogInterface dialog, int whichButton) {
                              mListener.onNeutral(getTag()); 
 +                            dialog.dismiss();
                          }
                      });
          if (negBtn != -1)
@@@ -108,7 -105,6 +109,7 @@@
                          @Override
                          public void onClick(DialogInterface dialog, int which) {
                              mListener.onCancel(getTag());
 +                            dialog.dismiss();
                          }
                      });
        return builder.create();
diff --combined src/com/owncloud/android/ui/fragment/FileDetailFragment.java
index e8b897c6,2d46a55c..80dc4264
--- a/src/com/owncloud/android/ui/fragment/FileDetailFragment.java
+++ b/src/com/owncloud/android/ui/fragment/FileDetailFragment.java
@@@ -1,9 -1,10 +1,10 @@@
  /* 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 3 of the License, or
+  *   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,
@@@ -18,7 -19,6 +19,7 @@@
  package com.owncloud.android.ui.fragment;
  
  import java.io.File;
 +import java.lang.ref.WeakReference;
  import java.util.ArrayList;
  import java.util.List;
  
@@@ -36,17 -36,25 +37,17 @@@ import org.json.JSONObject
  
  import android.accounts.Account;
  import android.accounts.AccountManager;
 -import android.annotation.SuppressLint;
  import android.app.Activity;
  import android.content.ActivityNotFoundException;
  import android.content.BroadcastReceiver;
  import android.content.Context;
  import android.content.Intent;
  import android.content.IntentFilter;
 -import android.graphics.Bitmap;
 -import android.graphics.BitmapFactory;
 -import android.graphics.BitmapFactory.Options;
 -import android.graphics.Point;
  import android.net.Uri;
 -import android.os.AsyncTask;
  import android.os.Bundle;
  import android.os.Handler;
 -import android.support.v4.app.DialogFragment;
  import android.support.v4.app.FragmentTransaction;
  import android.util.Log;
 -import android.view.Display;
  import android.view.LayoutInflater;
  import android.view.View;
  import android.view.View.OnClickListener;
@@@ -55,7 -63,6 +56,7 @@@ import android.webkit.MimeTypeMap
  import android.widget.Button;
  import android.widget.CheckBox;
  import android.widget.ImageView;
 +import android.widget.ProgressBar;
  import android.widget.TextView;
  import android.widget.Toast;
  
@@@ -65,6 -72,7 +66,6 @@@ import com.owncloud.android.DisplayUtil
  import com.owncloud.android.authenticator.AccountAuthenticator;
  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.FileObserverService;
  import com.owncloud.android.files.services.FileUploader;
  import com.owncloud.android.files.services.FileDownloader.FileDownloaderBinder;
@@@ -80,13 -88,12 +81,13 @@@ import com.owncloud.android.operations.
  import com.owncloud.android.ui.activity.ConflictsResolveActivity;
  import com.owncloud.android.ui.activity.FileDetailActivity;
  import com.owncloud.android.ui.activity.FileDisplayActivity;
 -import com.owncloud.android.ui.activity.TransferServiceGetter;
  import com.owncloud.android.ui.dialog.EditNameDialog;
  import com.owncloud.android.ui.dialog.EditNameDialog.EditNameDialogListener;
  import com.owncloud.android.utils.OwnCloudVersion;
  
  import com.owncloud.android.R;
 +
 +import eu.alefzero.webdav.OnDatatransferProgressListener;
  import eu.alefzero.webdav.WebdavClient;
  import eu.alefzero.webdav.WebdavUtils;
  
@@@ -94,30 -101,30 +95,30 @@@
   * This Fragment is used to display the details about a file.
   * 
   * @author Bartek Przybylski
 - * 
 + * @author David A. Velasco
   */
  public class FileDetailFragment extends SherlockFragment implements
 -        OnClickListener, ConfirmationDialogFragment.ConfirmationDialogFragmentListener, OnRemoteOperationListener, EditNameDialogListener {
 +        OnClickListener, 
 +        ConfirmationDialogFragment.ConfirmationDialogFragmentListener, OnRemoteOperationListener, EditNameDialogListener,
 +        FileFragment {
  
      public static final String EXTRA_FILE = "FILE";
      public static final String EXTRA_ACCOUNT = "ACCOUNT";
  
 -    private FileDetailFragment.ContainerActivity mContainerActivity;
 +    private FileFragment.ContainerActivity mContainerActivity;
      
      private int mLayout;
      private View mView;
      private OCFile mFile;
      private Account mAccount;
      private FileDataStorageManager mStorageManager;
 -    private ImageView mPreview;
      
 -    private DownloadFinishReceiver mDownloadFinishReceiver;
      private UploadFinishReceiver mUploadFinishReceiver;
 +    public ProgressListener mProgressListener;
      
      private Handler mHandler;
      private RemoteOperation mLastRemoteOperation;
 -    private DialogFragment mCurrentDialog;
 -
 +    
      private static final String TAG = FileDetailFragment.class.getSimpleName();
      public static final String FTAG = "FileDetails"; 
      public static final String FTAG_CONFIRMATION = "REMOVE_CONFIRMATION_FRAGMENT";
@@@ -133,7 -140,6 +134,7 @@@
          mAccount = null;
          mStorageManager = null;
          mLayout = R.layout.file_details_empty;
 +        mProgressListener = null;
      }
      
      
@@@ -150,7 -156,6 +151,7 @@@
          mAccount = ocAccount;
          mStorageManager = null; // we need a context to init this; the container activity is not available yet at this moment 
          mLayout = R.layout.file_details_empty;
 +        mProgressListener = null;
      }
      
      
@@@ -186,11 -191,10 +187,11 @@@
              mView.findViewById(R.id.fdOpenBtn).setOnClickListener(this);
              mView.findViewById(R.id.fdRemoveBtn).setOnClickListener(this);
              //mView.findViewById(R.id.fdShareBtn).setOnClickListener(this);
 -            mPreview = (ImageView)mView.findViewById(R.id.fdPreview);
 +            ProgressBar progressBar = (ProgressBar)mView.findViewById(R.id.fdProgressBar);
 +            mProgressListener = new ProgressListener(progressBar);
          }
          
 -        updateFileDetails(false);
 +        updateFileDetails(false, false);
          return view;
      }
      
@@@ -203,7 -207,6 +204,7 @@@
          super.onAttach(activity);
          try {
              mContainerActivity = (ContainerActivity) activity;
 +            
          } catch (ClassCastException e) {
              throw new ClassCastException(activity.toString() + " must implement " + FileDetailFragment.ContainerActivity.class.getSimpleName());
          }
@@@ -217,57 -220,59 +218,57 @@@
      public void onActivityCreated(Bundle savedInstanceState) {
          super.onActivityCreated(savedInstanceState);
          if (mAccount != null) {
 -            mStorageManager = new FileDataStorageManager(mAccount, getActivity().getApplicationContext().getContentResolver());;
 +            mStorageManager = new FileDataStorageManager(mAccount, getActivity().getApplicationContext().getContentResolver());
          }
      }
          
  
      @Override
      public void onSaveInstanceState(Bundle outState) {
 -        Log.i(getClass().toString(), "onSaveInstanceState() start");
          super.onSaveInstanceState(outState);
          outState.putParcelable(FileDetailFragment.EXTRA_FILE, mFile);
          outState.putParcelable(FileDetailFragment.EXTRA_ACCOUNT, mAccount);
 -        Log.i(getClass().toString(), "onSaveInstanceState() end");
      }
  
 +    @Override
 +    public void onStart() {
 +        super.onStart();
 +        listenForTransferProgress();
 +    }
      
      @Override
      public void onResume() {
          super.onResume();
 -        
 -        mDownloadFinishReceiver = new DownloadFinishReceiver();
 -        IntentFilter filter = new IntentFilter(
 -                FileDownloader.DOWNLOAD_FINISH_MESSAGE);
 -        getActivity().registerReceiver(mDownloadFinishReceiver, filter);
 -        
          mUploadFinishReceiver = new UploadFinishReceiver();
 -        filter = new IntentFilter(FileUploader.UPLOAD_FINISH_MESSAGE);
 +        IntentFilter filter = new IntentFilter(FileUploader.UPLOAD_FINISH_MESSAGE);
          getActivity().registerReceiver(mUploadFinishReceiver, filter);
 -        
 -        mPreview = (ImageView)mView.findViewById(R.id.fdPreview);
 +
      }
  
 +
      @Override
      public void onPause() {
          super.onPause();
 -        
 -        getActivity().unregisterReceiver(mDownloadFinishReceiver);
 -        mDownloadFinishReceiver = null;
 -        
 -        getActivity().unregisterReceiver(mUploadFinishReceiver);
 -        mUploadFinishReceiver = null;
 -        
 -        if (mPreview != null) {
 -            mPreview = null;
 +        if (mUploadFinishReceiver != null) {
 +            getActivity().unregisterReceiver(mUploadFinishReceiver);
 +            mUploadFinishReceiver = null;
          }
      }
  
 +    
 +    @Override
 +    public void onStop() {
 +        super.onStop();
 +        leaveTransferProgress();
 +    }
 +
 +    
      @Override
      public View getView() {
          return super.getView() == null ? mView : super.getView();
      }
  
      
 -    
      @Override
      public void onClick(View v) {
          switch (v.getId()) {
@@@ -310,6 -315,7 +311,6 @@@
                      // update ui 
                      boolean inDisplayActivity = getActivity() instanceof FileDisplayActivity;
                      getActivity().showDialog((inDisplayActivity)? FileDisplayActivity.DIALOG_SHORT_WAIT : FileDetailActivity.DIALOG_SHORT_WAIT);
 -                    setButtonsForTransferring(); // disable button immediately, although the synchronization does not result in a file transference
                      
                  }
                  break;
@@@ -329,6 -335,7 +330,6 @@@
                                     FileObserverService.CMD_DEL_OBSERVED_FILE));
                  intent.putExtra(FileObserverService.KEY_CMD_ARG_FILE, mFile);
                  intent.putExtra(FileObserverService.KEY_CMD_ARG_ACCOUNT, mAccount);
 -                Log.e(TAG, "starting observer service");
                  getActivity().startService(intent);
                  
                  if (mFile.keepInSync()) {
@@@ -349,11 -356,54 +350,11 @@@
                          mFile.isDown() ? R.string.confirmation_remove_local : -1,
                          R.string.common_cancel);
                  confDialog.setOnConfirmationListener(this);
 -                mCurrentDialog = confDialog;
 -                mCurrentDialog.show(getFragmentManager(), FTAG_CONFIRMATION);
 +                confDialog.show(getFragmentManager(), FTAG_CONFIRMATION);
                  break;
              }
              case R.id.fdOpenBtn: {
 -                String storagePath = mFile.getStoragePath();
 -                String encodedStoragePath = WebdavUtils.encodePath(storagePath);
 -                try {
 -                    Intent i = new Intent(Intent.ACTION_VIEW);
 -                    i.setDataAndType(Uri.parse("file://"+ encodedStoragePath), mFile.getMimetype());
 -                    i.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION | Intent.FLAG_GRANT_WRITE_URI_PERMISSION);
 -                    startActivity(i);
 -                    
 -                } catch (Throwable t) {
 -                    Log.e(TAG, "Fail when trying to open with the mimeType provided from the ownCloud server: " + mFile.getMimetype());
 -                    boolean toastIt = true; 
 -                    String mimeType = "";
 -                    try {
 -                        Intent i = new Intent(Intent.ACTION_VIEW);
 -                        mimeType = MimeTypeMap.getSingleton().getMimeTypeFromExtension(storagePath.substring(storagePath.lastIndexOf('.') + 1));
 -                        if (mimeType == null || !mimeType.equals(mFile.getMimetype())) {
 -                            if (mimeType != null) {
 -                                i.setDataAndType(Uri.parse("file://"+ encodedStoragePath), mimeType);
 -                            } else {
 -                                // desperate try
 -                                i.setDataAndType(Uri.parse("file://"+ encodedStoragePath), "*/*");
 -                            }
 -                            i.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION | Intent.FLAG_GRANT_WRITE_URI_PERMISSION);
 -                            startActivity(i);
 -                            toastIt = false;
 -                        }
 -                        
 -                    } catch (IndexOutOfBoundsException e) {
 -                        Log.e(TAG, "Trying to find out MIME type of a file without extension: " + storagePath);
 -                        
 -                    } catch (ActivityNotFoundException e) {
 -                        Log.e(TAG, "No activity found to handle: " + storagePath + " with MIME type " + mimeType + " obtained from extension");
 -                        
 -                    } catch (Throwable th) {
 -                        Log.e(TAG, "Unexpected problem when opening: " + storagePath, th);
 -                        
 -                    } finally {
 -                        if (toastIt) {
 -                            Toast.makeText(getActivity(), "There is no application to handle file " + mFile.getFileName(), Toast.LENGTH_SHORT).show();
 -                        }
 -                    }
 -                    
 -                }
 +                openFile();
                  break;
              }
              default:
@@@ -367,57 -417,6 +368,57 @@@
      }
      
      
 +    /**
 +     * Opens mFile.
 +     */
 +    private void openFile() {
 +        
 +        String storagePath = mFile.getStoragePath();
 +        String encodedStoragePath = WebdavUtils.encodePath(storagePath);
 +        try {
 +            Intent i = new Intent(Intent.ACTION_VIEW);
 +            i.setDataAndType(Uri.parse("file://"+ encodedStoragePath), mFile.getMimetype());
 +            i.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION | Intent.FLAG_GRANT_WRITE_URI_PERMISSION);
 +            startActivity(i);
 +            
 +        } catch (Throwable t) {
 +            Log.e(TAG, "Fail when trying to open with the mimeType provided from the ownCloud server: " + mFile.getMimetype());
 +            boolean toastIt = true; 
 +            String mimeType = "";
 +            try {
 +                Intent i = new Intent(Intent.ACTION_VIEW);
 +                mimeType = MimeTypeMap.getSingleton().getMimeTypeFromExtension(storagePath.substring(storagePath.lastIndexOf('.') + 1));
 +                if (mimeType == null || !mimeType.equals(mFile.getMimetype())) {
 +                    if (mimeType != null) {
 +                        i.setDataAndType(Uri.parse("file://"+ encodedStoragePath), mimeType);
 +                    } else {
 +                        // desperate try
 +                        i.setDataAndType(Uri.parse("file://"+ encodedStoragePath), "*/*");
 +                    }
 +                    i.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION | Intent.FLAG_GRANT_WRITE_URI_PERMISSION);
 +                    startActivity(i);
 +                    toastIt = false;
 +                }
 +                
 +            } catch (IndexOutOfBoundsException e) {
 +                Log.e(TAG, "Trying to find out MIME type of a file without extension: " + storagePath);
 +                
 +            } catch (ActivityNotFoundException e) {
 +                Log.e(TAG, "No activity found to handle: " + storagePath + " with MIME type " + mimeType + " obtained from extension");
 +                
 +            } catch (Throwable th) {
 +                Log.e(TAG, "Unexpected problem when opening: " + storagePath, th);
 +                
 +            } finally {
 +                if (toastIt) {
 +                    Toast.makeText(getActivity(), "There is no application to handle file " + mFile.getFileName(), Toast.LENGTH_SHORT).show();
 +                }
 +            }
 +            
 +        }
 +    }
 +
 +
      @Override
      public void onConfirmation(String callerTag) {
          if (callerTag.equals(FTAG_CONFIRMATION)) {
@@@ -432,6 -431,8 +433,6 @@@
                  getActivity().showDialog((inDisplayActivity)? FileDisplayActivity.DIALOG_SHORT_WAIT : FileDetailActivity.DIALOG_SHORT_WAIT);
              }
          }
 -        mCurrentDialog.dismiss();
 -        mCurrentDialog = null;
      }
      
      @Override
@@@ -443,11 -444,15 +444,11 @@@
              mStorageManager.saveFile(mFile);
              updateFileDetails(mFile, mAccount);
          }
 -        mCurrentDialog.dismiss();
 -        mCurrentDialog = null;
      }
      
      @Override
      public void onCancel(String callerTag) {
          Log.d(TAG, "REMOVAL CANCELED");
 -        mCurrentDialog.dismiss();
 -        mCurrentDialog = null;
      }
      
      
@@@ -462,9 -467,10 +463,9 @@@
  
      
      /**
 -     * Can be used to get the file that is currently being displayed.
 -     * @return The file on the screen.
 +     * {@inheritDoc}
       */
 -    public OCFile getDisplayedFile(){
 +    public OCFile getFile(){
          return mFile;
      }
      
@@@ -482,7 -488,7 +483,7 @@@
              mStorageManager = new FileDataStorageManager(ocAccount, getActivity().getApplicationContext().getContentResolver());
          }
          mAccount = ocAccount;
 -        updateFileDetails(false);
 +        updateFileDetails(false, false);
      }
      
  
@@@ -491,21 -497,14 +492,21 @@@
       *
       * TODO Remove parameter when the transferring state of files is kept in database. 
       * 
 +     * TODO REFACTORING! this method called 5 times before every time the fragment is shown! 
 +     * 
       * @param transferring      Flag signaling if the file should be considered as downloading or uploading, 
       *                          although {@link FileDownloaderBinder#isDownloading(Account, OCFile)}  and 
       *                          {@link FileUploaderBinder#isUploading(Account, OCFile)} return false.
 -     * 
 +     *                          
 +     * @param refresh           If 'true', try to refresh the hold file from the database
       */
 -    public void updateFileDetails(boolean transferring) {
 +    public void updateFileDetails(boolean transferring, boolean refresh) {
  
 -        if (mFile != null && mAccount != null && mLayout == R.layout.file_details_fragment) {
 +        if (readyToShow()) {
 +            
 +            if (refresh && mStorageManager != null) {
 +                mFile = mStorageManager.getFileByPath(mFile.getRemotePath());
 +            }
              
              // set file details
              setFilename(mFile.getFileName());
@@@ -528,6 -527,11 +529,6 @@@
                  setButtonsForTransferring();
                  
              } else if (mFile.isDown()) {
 -                // Update preview
 -                if (mFile.getMimetype().startsWith("image/")) {
 -                    BitmapLoader bl = new BitmapLoader();
 -                    bl.execute(new String[]{mFile.getStoragePath()});
 -                }
                  
                  setButtonsForDown();
                  
@@@ -541,17 -545,6 +542,17 @@@
      
      
      /**
 +     * Checks if the fragment is ready to show details of a OCFile
 +     *  
 +     * @return  'True' when the fragment is ready to show details of a file
 +     */
 +    private boolean readyToShow() {
 +        return (mFile != null && mAccount != null && mLayout == R.layout.file_details_fragment);        
 +    }
 +
 +
 +
 +    /**
       * Updates the filename in view
       * @param filename to set
       */
@@@ -626,23 -619,9 +627,23 @@@
              ((Button) getView().findViewById(R.id.fdRenameBtn)).setEnabled(false);
              ((Button) getView().findViewById(R.id.fdRemoveBtn)).setEnabled(false);
              getView().findViewById(R.id.fdKeepInSync).setEnabled(false);
 +            
 +            // show the progress bar for the transfer
 +            ProgressBar progressBar = (ProgressBar)getView().findViewById(R.id.fdProgressBar);
 +            progressBar.setVisibility(View.VISIBLE);
 +            TextView progressText = (TextView)getView().findViewById(R.id.fdProgressText);
 +            progressText.setVisibility(View.VISIBLE);
 +            FileDownloaderBinder downloaderBinder = mContainerActivity.getFileDownloaderBinder();
 +            FileUploaderBinder uploaderBinder = mContainerActivity.getFileUploaderBinder();
 +            if (downloaderBinder != null && downloaderBinder.isDownloading(mAccount, mFile)) {
 +                progressText.setText(R.string.downloader_download_in_progress_ticker);
 +            } else if (uploaderBinder != null && uploaderBinder.isUploading(mAccount, mFile)) {
 +                progressText.setText(R.string.uploader_upload_in_progress_ticker);
 +            }
          }
      }
      
 +
      /**
       * Enables or disables buttons for a file locally available 
       */
@@@ -655,12 -634,6 +656,12 @@@
              ((Button) getView().findViewById(R.id.fdRenameBtn)).setEnabled(true);
              ((Button) getView().findViewById(R.id.fdRemoveBtn)).setEnabled(true);
              getView().findViewById(R.id.fdKeepInSync).setEnabled(true);
 +            
 +            // hides the progress bar
 +            ProgressBar progressBar = (ProgressBar)getView().findViewById(R.id.fdProgressBar);
 +            progressBar.setVisibility(View.GONE);
 +            TextView progressText = (TextView)getView().findViewById(R.id.fdProgressText);
 +            progressText.setVisibility(View.GONE);
          }
      }
  
@@@ -676,12 -649,6 +677,12 @@@
              ((Button) getView().findViewById(R.id.fdRenameBtn)).setEnabled(true);
              ((Button) getView().findViewById(R.id.fdRemoveBtn)).setEnabled(true);
              getView().findViewById(R.id.fdKeepInSync).setEnabled(true);
 +            
 +            // hides the progress bar
 +            ProgressBar progressBar = (ProgressBar)getView().findViewById(R.id.fdProgressBar);
 +            progressBar.setVisibility(View.GONE);
 +            TextView progressText = (TextView)getView().findViewById(R.id.fdProgressText);
 +            progressText.setVisibility(View.GONE);
          }
      }
      
@@@ -707,6 -674,53 +708,6 @@@
      
      
      /**
 -     * Interface to implement by any Activity that includes some instance of FileDetailFragment
 -     * 
 -     * @author David A. Velasco
 -     */
 -    public interface ContainerActivity extends TransferServiceGetter {
 -
 -        /**
 -         * Callback method invoked when the detail fragment wants to notice its container 
 -         * activity about a relevant state the file shown by the fragment.
 -         * 
 -         * Added to notify to FileDisplayActivity about the need of refresh the files list. 
 -         * 
 -         * Currently called when:
 -         *  - a download is started;
 -         *  - a rename is completed;
 -         *  - a deletion is completed;
 -         *  - the 'inSync' flag is changed;
 -         */
 -        public void onFileStateChanged();
 -        
 -    }
 -    
 -
 -    /**
 -     * Once the file download has finished -> update view
 -     * @author Bartek Przybylski
 -     */
 -    private class DownloadFinishReceiver extends BroadcastReceiver {
 -        @Override
 -        public void onReceive(Context context, Intent intent) {
 -            String accountName = intent.getStringExtra(FileDownloader.ACCOUNT_NAME);
 -
 -            if (!isEmpty() && accountName.equals(mAccount.name)) {
 -                boolean downloadWasFine = intent.getBooleanExtra(FileDownloader.EXTRA_DOWNLOAD_RESULT, false);
 -                String downloadedRemotePath = intent.getStringExtra(FileDownloader.EXTRA_REMOTE_PATH);
 -                if (mFile.getRemotePath().equals(downloadedRemotePath)) {
 -                    if (downloadWasFine) {
 -                        mFile = mStorageManager.getFileByPath(downloadedRemotePath);
 -                    }
 -                    updateFileDetails(false);    // it updates the buttons; must be called although !downloadWasFine
 -                }
 -            }
 -        }
 -    }
 -    
 -    
 -    /**
       * Once the file upload has finished -> update view
       * 
       * Being notified about the finish of an upload is necessary for the next sequence:
@@@ -736,7 -750,7 +737,7 @@@
                          msg.show();
                      }
                      getSherlockActivity().removeStickyBroadcast(intent);    // not the best place to do this; a small refactorization of BroadcastReceivers should be done
 -                    updateFileDetails(false);    // it updates the buttons; must be called although !uploadWasFine; interrupted uploads still leave an incomplete file in the server
 +                    updateFileDetails(false, false);    // it updates the buttons; must be called although !uploadWasFine; interrupted uploads still leave an incomplete file in the server
                  }
              }
          }
@@@ -863,6 -877,80 +864,6 @@@
      }
      
      
 -    class BitmapLoader extends AsyncTask<String, Void, Bitmap> {
 -        @SuppressLint({ "NewApi", "NewApi", "NewApi" }) // to avoid Lint errors since Android SDK r20
 -		@Override
 -        protected Bitmap doInBackground(String... params) {
 -            Bitmap result = null;
 -            if (params.length != 1) return result;
 -            String storagePath = params[0];
 -            try {
 -
 -                BitmapFactory.Options options = new Options();
 -                options.inScaled = true;
 -                options.inPurgeable = true;
 -                options.inJustDecodeBounds = true;
 -                if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.GINGERBREAD_MR1) {
 -                    options.inPreferQualityOverSpeed = false;
 -                }
 -                if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.HONEYCOMB) {
 -                    options.inMutable = false;
 -                }
 -
 -                result = BitmapFactory.decodeFile(storagePath, options);
 -                options.inJustDecodeBounds = false;
 -
 -                int width = options.outWidth;
 -                int height = options.outHeight;
 -                int scale = 1;
 -                if (width >= 2048 || height >= 2048) {
 -                    scale = (int) Math.ceil((Math.ceil(Math.max(height, width) / 2048.)));
 -                    options.inSampleSize = scale;
 -                }
 -                Display display = getActivity().getWindowManager().getDefaultDisplay();
 -                Point size = new Point();
 -                int screenwidth;
 -                if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.HONEYCOMB_MR2) {
 -                    display.getSize(size);
 -                    screenwidth = size.x;
 -                } else {
 -                    screenwidth = display.getWidth();
 -                }
 -
 -                Log.e("ASD", "W " + width + " SW " + screenwidth);
 -
 -                if (width > screenwidth) {
 -                    scale = (int) Math.ceil((float)width / screenwidth);
 -                    options.inSampleSize = scale;
 -                }
 -
 -                result = BitmapFactory.decodeFile(storagePath, options);
 -
 -                Log.e("ASD", "W " + options.outWidth + " SW " + options.outHeight);
 -
 -            } catch (OutOfMemoryError e) {
 -                result = null;
 -                Log.e(TAG, "Out of memory occured for file with size " + storagePath);
 -                
 -            } catch (NoSuchFieldError e) {
 -                result = null;
 -                Log.e(TAG, "Error from access to unexisting field despite protection " + storagePath);
 -                
 -            } catch (Throwable t) {
 -                result = null;
 -                Log.e(TAG, "Unexpected error while creating image preview " + storagePath, t);
 -            }
 -            return result;
 -        }
 -        @Override
 -        protected void onPostExecute(Bitmap result) {
 -            if (result != null && mPreview != null) {
 -                mPreview.setImageBitmap(result);
 -            }
 -        }
 -        
 -    }
 -
      /**
       * {@inheritDoc}
       */
@@@ -956,7 -1044,6 +957,7 @@@
              
          } else {
              if (operation.transferWasRequested()) {
 +                setButtonsForTransferring();
                  mContainerActivity.onFileStateChanged();    // this is not working; FileDownloader won't do NOTHING at all until this method finishes, so 
                                                              // checking the service to see if the file is downloading results in FALSE
              } else {
@@@ -971,66 -1058,5 +972,66 @@@
              }
          }
      }
 +    
 +    
 +    public void listenForTransferProgress() {
 +        if (mProgressListener != null) {
 +            if (mContainerActivity.getFileDownloaderBinder() != null) {
 +                mContainerActivity.getFileDownloaderBinder().addDatatransferProgressListener(mProgressListener, mAccount, mFile);
 +            }
 +            if (mContainerActivity.getFileUploaderBinder() != null) {
 +                mContainerActivity.getFileUploaderBinder().addDatatransferProgressListener(mProgressListener, mAccount, mFile);
 +            }
 +        }
 +    }
 +    
 +    
 +    public void leaveTransferProgress() {
 +        if (mProgressListener != null) {
 +            if (mContainerActivity.getFileDownloaderBinder() != null) {
 +                mContainerActivity.getFileDownloaderBinder().removeDatatransferProgressListener(mProgressListener, mAccount, mFile);
 +            }
 +            if (mContainerActivity.getFileUploaderBinder() != null) {
 +                mContainerActivity.getFileUploaderBinder().removeDatatransferProgressListener(mProgressListener, mAccount, mFile);
 +            }
 +        }
 +    }
 +
 +
 +    
 +    /**
 +     * Helper class responsible for updating the progress bar shown for file uploading or downloading  
 +     * 
 +     * @author David A. Velasco
 +     */
 +    private class ProgressListener implements OnDatatransferProgressListener {
 +        int mLastPercent = 0;
 +        WeakReference<ProgressBar> mProgressBar = null;
 +        
 +        ProgressListener(ProgressBar progressBar) {
 +            mProgressBar = new WeakReference<ProgressBar>(progressBar);
 +        }
 +        
 +        @Override
 +        public void onTransferProgress(long progressRate) {
 +            // old method, nothing here
 +        };
 +
 +        @Override
 +        public void onTransferProgress(long progressRate, long totalTransferredSoFar, long totalToTransfer, String filename) {
 +            int percent = (int)(100.0*((double)totalTransferredSoFar)/((double)totalToTransfer));
 +            if (percent != mLastPercent) {
 +                ProgressBar pb = mProgressBar.get();
 +                if (pb != null) {
 +                    pb.setProgress(percent);
 +                    pb.postInvalidate();
 +                }
 +            }
 +            mLastPercent = percent;
 +        }
 +
 +    };
 +    
 +
  
  }
diff --combined src/com/owncloud/android/ui/fragment/OCFileListFragment.java
index 9a479da2,34e156d3..90a06c0d
--- a/src/com/owncloud/android/ui/fragment/OCFileListFragment.java
+++ b/src/com/owncloud/android/ui/fragment/OCFileListFragment.java
@@@ -1,9 -1,10 +1,10 @@@
  /* 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 3 of the License, or
+  *   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,
@@@ -80,6 -81,8 +81,6 @@@ public class OCFileListFragment extend
      private Handler mHandler;
      private OCFile mTargetFile;
      
 -    private DialogFragment mCurrentDialog;
 -    
      /**
       * {@inheritDoc}
       */
@@@ -160,7 -163,7 +161,7 @@@
      public void onCreateContextMenu (ContextMenu menu, View v, ContextMenu.ContextMenuInfo menuInfo) {
          super.onCreateContextMenu(menu, v, menuInfo);
          MenuInflater inflater = getActivity().getMenuInflater();
 -        inflater.inflate(R.menu.file_context_menu, menu);
 +        inflater.inflate(R.menu.file_actions_menu, menu);
          AdapterContextMenuInfo info = (AdapterContextMenuInfo) menuInfo;
          OCFile targetFile = (OCFile) mAdapter.getItem(info.position);
          List<Integer> toHide = new ArrayList<Integer>();    
@@@ -169,47 -172,46 +170,47 @@@
          MenuItem item = null;
          if (targetFile.isDirectory()) {
              // contextual menu for folders
 -            toHide.add(R.id.open_file_item);
 -            toHide.add(R.id.download_file_item);
 -            toHide.add(R.id.cancel_download_item);
 -            toHide.add(R.id.cancel_upload_item);
 +            toHide.add(R.id.action_open_file_with);
 +            toHide.add(R.id.action_download_file);
 +            toHide.add(R.id.action_cancel_download);
 +            toHide.add(R.id.action_cancel_upload);
 +            toHide.add(R.id.action_see_details);
              if (    mContainerActivity.getFileDownloaderBinder().isDownloading(AccountUtils.getCurrentOwnCloudAccount(getActivity()), targetFile) ||
                      mContainerActivity.getFileUploaderBinder().isUploading(AccountUtils.getCurrentOwnCloudAccount(getActivity()), targetFile)           ) {
 -                toDisable.add(R.id.rename_file_item);
 -                toDisable.add(R.id.remove_file_item);
 +                toDisable.add(R.id.action_rename_file);
 +                toDisable.add(R.id.action_remove_file);
                  
              }
              
          } else {
              // contextual menu for regular files
              if (targetFile.isDown()) {
 -                toHide.add(R.id.cancel_download_item);
 -                toHide.add(R.id.cancel_upload_item);
 -                item = menu.findItem(R.id.download_file_item);
 +                toHide.add(R.id.action_cancel_download);
 +                toHide.add(R.id.action_cancel_upload);
 +                item = menu.findItem(R.id.action_download_file);
                  if (item != null) {
                      item.setTitle(R.string.filedetails_sync_file);
                  }
              } else {
 -                toHide.add(R.id.open_file_item);
 +                toHide.add(R.id.action_open_file_with);
              }
              if ( mContainerActivity.getFileDownloaderBinder().isDownloading(AccountUtils.getCurrentOwnCloudAccount(getActivity()), targetFile)) {
 -                toHide.add(R.id.download_file_item);
 -                toHide.add(R.id.cancel_upload_item);
 -                toDisable.add(R.id.open_file_item);
 -                toDisable.add(R.id.rename_file_item);
 -                toDisable.add(R.id.remove_file_item);
 +                toHide.add(R.id.action_download_file);
 +                toHide.add(R.id.action_cancel_upload);
 +                toDisable.add(R.id.action_open_file_with);
 +                toDisable.add(R.id.action_rename_file);
 +                toDisable.add(R.id.action_remove_file);
                      
              } else if ( mContainerActivity.getFileUploaderBinder().isUploading(AccountUtils.getCurrentOwnCloudAccount(getActivity()), targetFile)) {
 -                toHide.add(R.id.download_file_item);
 -                toHide.add(R.id.cancel_download_item);
 -                toDisable.add(R.id.open_file_item);
 -                toDisable.add(R.id.rename_file_item);
 -                toDisable.add(R.id.remove_file_item);
 +                toHide.add(R.id.action_download_file);
 +                toHide.add(R.id.action_cancel_download);
 +                toDisable.add(R.id.action_open_file_with);
 +                toDisable.add(R.id.action_rename_file);
 +                toDisable.add(R.id.action_remove_file);
                      
              } else {
 -                toHide.add(R.id.cancel_download_item);
 -                toHide.add(R.id.cancel_upload_item);
 +                toHide.add(R.id.action_cancel_download);
 +                toHide.add(R.id.action_cancel_upload);
              }
          }
  
@@@ -238,12 -240,12 +239,12 @@@
          AdapterContextMenuInfo info = (AdapterContextMenuInfo) item.getMenuInfo();        
          mTargetFile = (OCFile) mAdapter.getItem(info.position);
          switch (item.getItemId()) {
 -            case R.id.rename_file_item: {
 +            case R.id.action_rename_file: {
                  EditNameDialog dialog = EditNameDialog.newInstance(getString(R.string.rename_dialog_title), mTargetFile.getFileName(), this);
                  dialog.show(getFragmentManager(), EditNameDialog.TAG);
                  return true;
              }
 -            case R.id.remove_file_item: {
 +            case R.id.action_remove_file: {
                  int messageStringId = R.string.confirmation_remove_alert;
                  int posBtnStringId = R.string.confirmation_remove_remote;
                  int neuBtnStringId = -1;
@@@ -262,10 -264,11 +263,10 @@@
                          neuBtnStringId,
                          R.string.common_cancel);
                  confDialog.setOnConfirmationListener(this);
 -                mCurrentDialog = confDialog;
 -                mCurrentDialog.show(getFragmentManager(), FileDetailFragment.FTAG_CONFIRMATION);
 +                confDialog.show(getFragmentManager(), FileDetailFragment.FTAG_CONFIRMATION);
                  return true;
              }
 -            case R.id.open_file_item: {
 +            case R.id.action_open_file_with: {
                  String storagePath = mTargetFile.getStoragePath();
                  String encodedStoragePath = WebdavUtils.encodePath(storagePath);
                  try {
@@@ -311,7 -314,7 +312,7 @@@
                  }
                  return true;
              }
 -            case R.id.download_file_item: {
 +            case R.id.action_download_file: {
                  Account account = AccountUtils.getCurrentOwnCloudAccount(getSherlockActivity());
                  RemoteOperation operation = new SynchronizeFileOperation(mTargetFile, null, mContainerActivity.getStorageManager(), account, true, false, getSherlockActivity());
                  WebdavClient wc = OwnCloudClientUtils.createOwnCloudClient(account, getSherlockActivity().getApplicationContext());
@@@ -319,7 -322,7 +320,7 @@@
                  getSherlockActivity().showDialog(FileDisplayActivity.DIALOG_SHORT_WAIT);
                  return true;
              }
 -            case R.id.cancel_download_item: {
 +            case R.id.action_cancel_download: {
                  FileDownloaderBinder downloaderBinder = mContainerActivity.getFileDownloaderBinder();
                  Account account = AccountUtils.getCurrentOwnCloudAccount(getActivity());
                  if (downloaderBinder != null && downloaderBinder.isDownloading(account, mTargetFile)) {
@@@ -329,7 -332,7 +330,7 @@@
                  }
                  return true;
              }
 -            case R.id.cancel_upload_item: {
 +            case R.id.action_cancel_upload: {
                  FileUploaderBinder uploaderBinder = mContainerActivity.getFileUploaderBinder();
                  Account account = AccountUtils.getCurrentOwnCloudAccount(getActivity());
                  if (uploaderBinder != null && uploaderBinder.isUploading(account, mTargetFile)) {
@@@ -339,10 -342,6 +340,10 @@@
                  }
                  return true;
              }
 +            case R.id.action_see_details: {
 +                ((FileFragment.ContainerActivity)getActivity()).showFragmentWithDetails(mTargetFile);
 +                return true;
 +            }
              default:
                  return super.onContextItemSelected(item); 
          }
@@@ -500,6 -499,10 +501,6 @@@
                  
                  getActivity().showDialog(FileDisplayActivity.DIALOG_SHORT_WAIT);
              }
 -            if (mCurrentDialog != null) {
 -                mCurrentDialog.dismiss();
 -                mCurrentDialog = null;
 -            }
          }
      }
      
@@@ -515,6 -518,10 +516,6 @@@
              mTargetFile.setStoragePath(null);
              mContainerActivity.getStorageManager().saveFile(mTargetFile);
          }
 -        if (mCurrentDialog != null) {
 -            mCurrentDialog.dismiss();
 -            mCurrentDialog = null;
 -        }
          listDirectory();
          mContainerActivity.onTransferStateChanged(mTargetFile, false, false);
      }
@@@ -522,6 -529,10 +523,6 @@@
      @Override
      public void onCancel(String callerTag) {
          Log.d(TAG, "REMOVAL CANCELED");
 -        if (mCurrentDialog != null) {
 -            mCurrentDialog.dismiss();
 -            mCurrentDialog = null;
 -        }
      }
  
  
diff --combined src/eu/alefzero/webdav/ChunkFromFileChannelRequestEntity.java
index 7f15d8b8,d39f8ce7..8d3912d9
--- a/src/eu/alefzero/webdav/ChunkFromFileChannelRequestEntity.java
+++ b/src/eu/alefzero/webdav/ChunkFromFileChannelRequestEntity.java
@@@ -1,9 -1,9 +1,9 @@@
  /* 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 3 of the License, or
+  *   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,
@@@ -30,8 -30,6 +30,8 @@@ import java.util.Set
  
  import org.apache.commons.httpclient.methods.RequestEntity;
  
 +import com.owncloud.android.network.ProgressiveDataTransferer;
 +
  import eu.alefzero.webdav.OnDatatransferProgressListener;
  
  import android.util.Log;
@@@ -42,7 -40,7 +42,7 @@@
   * 
   * @author David A. Velasco
   */
 -public class ChunkFromFileChannelRequestEntity implements RequestEntity {
 +public class ChunkFromFileChannelRequestEntity implements RequestEntity, ProgressiveDataTransferer {
  
      private static final String TAG = ChunkFromFileChannelRequestEntity.class.getSimpleName();
      
@@@ -92,25 -90,16 +92,25 @@@
          return true;
      }
      
 -    public void addOnDatatransferProgressListener(OnDatatransferProgressListener listener) {
 -        mDataTransferListeners.add(listener);
 +    @Override
 +    public void addDatatransferProgressListener(OnDatatransferProgressListener listener) {
 +        synchronized (mDataTransferListeners) {
 +            mDataTransferListeners.add(listener);
 +        }
      }
      
 -    public void addOnDatatransferProgressListeners(Collection<OnDatatransferProgressListener> listeners) {
 -        mDataTransferListeners.addAll(listeners);
 +    @Override
 +    public void addDatatransferProgressListeners(Collection<OnDatatransferProgressListener> listeners) {
 +        synchronized (mDataTransferListeners) {
 +            mDataTransferListeners.addAll(listeners);
 +        }
      }
      
 -    public void removeOnDatatransferProgressListener(OnDatatransferProgressListener listener) {
 -        mDataTransferListeners.remove(listener);
 +    @Override
 +    public void removeDatatransferProgressListener(OnDatatransferProgressListener listener) {
 +        synchronized (mDataTransferListeners) {
 +            mDataTransferListeners.remove(listener);
 +        }
      }
      
      
@@@ -127,11 -116,9 +127,11 @@@
                  out.write(mBuffer.array(), 0, readCount);
                  mBuffer.clear();
                  mTransferred += readCount;
 -                it = mDataTransferListeners.iterator();
 -                while (it.hasNext()) {
 -                    it.next().onTransferProgress(readCount, mTransferred, size, mFile.getName());
 +                synchronized (mDataTransferListeners) {
 +                    it = mDataTransferListeners.iterator();
 +                    while (it.hasNext()) {
 +                        it.next().onTransferProgress(readCount, mTransferred, size, mFile.getName());
 +                    }
                  }
              }
              
diff --combined src/eu/alefzero/webdav/FileRequestEntity.java
index aa32a324,3adaa3a8..d60eabf1
--- a/src/eu/alefzero/webdav/FileRequestEntity.java
+++ b/src/eu/alefzero/webdav/FileRequestEntity.java
@@@ -1,9 -1,10 +1,10 @@@
  /* 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 3 of the License, or
+  *   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,
@@@ -31,8 -32,6 +32,8 @@@ import java.util.Set
  
  import org.apache.commons.httpclient.methods.RequestEntity;
  
 +import com.owncloud.android.network.ProgressiveDataTransferer;
 +
  import eu.alefzero.webdav.OnDatatransferProgressListener;
  
  import android.util.Log;
@@@ -42,7 -41,7 +43,7 @@@
   * A RequestEntity that represents a File.
   * 
   */
 -public class FileRequestEntity implements RequestEntity {
 +public class FileRequestEntity implements RequestEntity, ProgressiveDataTransferer {
  
      final File mFile;
      final String mContentType;
@@@ -71,26 -70,17 +72,26 @@@
      public boolean isRepeatable() {
          return true;
      }
 -    
 -    public void addOnDatatransferProgressListener(OnDatatransferProgressListener listener) {
 -        mDataTransferListeners.add(listener);
 +
 +    @Override
 +    public void addDatatransferProgressListener(OnDatatransferProgressListener listener) {
 +        synchronized (mDataTransferListeners) {
 +            mDataTransferListeners.add(listener);
 +        }
      }
      
 -    public void addOnDatatransferProgressListeners(Collection<OnDatatransferProgressListener> listeners) {
 -        mDataTransferListeners.addAll(listeners);
 +    @Override
 +    public void addDatatransferProgressListeners(Collection<OnDatatransferProgressListener> listeners) {
 +        synchronized (mDataTransferListeners) {
 +            mDataTransferListeners.addAll(listeners);
 +        }
      }
      
 -    public void removeOnDatatransferProgressListener(OnDatatransferProgressListener listener) {
 -        mDataTransferListeners.remove(listener);
 +    @Override
 +    public void removeDatatransferProgressListener(OnDatatransferProgressListener listener) {
 +        synchronized (mDataTransferListeners) {
 +            mDataTransferListeners.remove(listener);
 +        }
      }
      
      
@@@ -113,11 -103,9 +114,11 @@@
                  out.write(tmp.array(), 0, readResult);
                  tmp.clear();
                  transferred += readResult;
 -                it = mDataTransferListeners.iterator();
 -                while (it.hasNext()) {
 -                    it.next().onTransferProgress(readResult, transferred, size, mFile.getName());
 +                synchronized (mDataTransferListeners) {
 +                    it = mDataTransferListeners.iterator();
 +                    while (it.hasNext()) {
 +                        it.next().onTransferProgress(readResult, transferred, size, mFile.getName());
 +                    }
                  }
              }
              
diff --combined src/eu/alefzero/webdav/WebdavClient.java
index f34cb692,1319a2b0..df30dcb6
--- a/src/eu/alefzero/webdav/WebdavClient.java
+++ b/src/eu/alefzero/webdav/WebdavClient.java
@@@ -1,9 -1,10 +1,10 @@@
  /* 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 3 of the License, or
+  *   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,
@@@ -165,7 -166,7 +166,7 @@@ public class WebdavClient extends HttpC
          try {
              File f = new File(localFile);
              FileRequestEntity entity = new FileRequestEntity(f, contentType);
 -            entity.addOnDatatransferProgressListener(mDataTransferListener);
 +            entity.addDatatransferProgressListener(mDataTransferListener);
              put.setRequestEntity(entity);
              status = executeMethod(put);