From: masensio <masensio@solidgear.es>
Date: Tue, 10 Mar 2015 13:58:21 +0000 (+0100)
Subject: Merge branch 'develop' into accessibility
X-Git-Tag: oc-android-1.7.1_signed^2~17^2
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/c963eb0fad38ec71f511de231bd81deadecc70fb?ds=inline;hp=-c

Merge branch 'develop' into accessibility

Conflicts:
	src/com/owncloud/android/ui/adapter/FileListListAdapter.java
---

c963eb0fad38ec71f511de231bd81deadecc70fb
diff --combined res/layout-land/account_setup.xml
index 91707820,61ca2dd2..fa357c23
--- a/res/layout-land/account_setup.xml
+++ b/res/layout-land/account_setup.xml
@@@ -3,7 -3,7 +3,7 @@@
    ownCloud Android client application
  
    Copyright (C) 2012  Bartek Przybylski
-   Copyright (C) 2012-2013 ownCloud Inc.
+   Copyright (C) 2015 ownCloud Inc.
  
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License version 2,
@@@ -32,14 -32,13 +32,14 @@@
          android:orientation="horizontal" >
          
  		<ImageView
- 			android:id="@+id/imageView1"
+ 			android:id="@+id/thumbnail"
  			android:layout_width="0dp"
  			android:layout_height="wrap_content"
  			android:layout_weight="1"
  			android:layout_gravity="center"
  			android:background="@color/login_logo_background_color"
 -			android:src="@drawable/logo" 
 +			android:src="@drawable/logo"
 +            android:contentDescription="@string/app_name"
  			/>
  		
  		<ScrollView
@@@ -66,8 -65,7 +66,8 @@@
  					android:layout_marginBottom="10dp"
              		android:onClick="onRefreshClick"
  				    android:text="@string/auth_check_server"
 -				    android:visibility="gone" />
 +				    android:visibility="gone"
 +                    android:contentDescription="@string/auth_check_server"/>
  				<TextView
  				    android:id="@+id/instructions_message"
  				    android:layout_width="wrap_content"
@@@ -75,8 -73,7 +75,8 @@@
  				    android:layout_gravity="fill_horizontal"
  				    android:text="@string/auth_expired_basic_auth_toast" 
  				    android:visibility="gone"
 -				    android:layout_marginBottom="10dp"/>
 +				    android:layout_marginBottom="10dp"
 +                    android:contentDescription="@string/auth_expired_basic_auth_toast"/>
  			    <FrameLayout 
  	        		android:id="@+id/hostUrlFrame"
  					android:layout_width="match_parent"
@@@ -92,7 -89,6 +92,7 @@@
  						android:inputType="textUri"
  						android:drawablePadding="5dp"
  						android:paddingRight="55dp"
 +						android:contentDescription="@string/auth_host_address"
  						>
  						<requestFocus />
  					</EditText>
@@@ -108,7 -104,6 +108,7 @@@
              			android:onClick="onRefreshClick"
  					    android:visibility="gone"
  						android:background="@android:color/transparent"
 +                        android:contentDescription="@string/auth_refresh_button"
  					    />
  				</FrameLayout>
  		
@@@ -120,8 -115,7 +120,8 @@@
  					android:drawableLeft="@android:drawable/stat_notify_sync"
  					android:drawablePadding="5dp"
  					android:gravity="center_vertical"
 -					android:text="@string/auth_testing_connection" />
 +					android:text="@string/auth_testing_connection"
 +                    android:contentDescription="@string/auth_testing_connection"/>
  		             
  				<CheckBox
  					android:id="@+id/oauth_onOff_check"
@@@ -131,7 -125,6 +131,7 @@@
  					android:onClick="onCheckClick"
  					android:text="@string/oauth_check_onoff"
  					android:textAppearance="?android:attr/textAppearanceSmall"
 +                    android:contentDescription="@string/oauth_check_onoff"
  					/>
  		
  				<EditText
@@@ -143,7 -136,7 +143,7 @@@
  					android:text="@string/oauth2_url_endpoint_auth"
  					android:singleLine="true"
  					android:inputType="textUri"
 -					android:visibility="gone" >
 +					android:visibility="gone">
  				</EditText>            
  				
  				<EditText
@@@ -155,7 -148,7 +155,7 @@@
  					android:text="@string/oauth2_url_endpoint_access"
  					android:singleLine="true"
  					android:inputType="textUri"
 -					android:visibility="gone" >
 +					android:visibility="gone">
  					<requestFocus />
  				</EditText>            
  		
@@@ -165,8 -158,7 +165,8 @@@
  					android:layout_height="wrap_content"
  					android:ems="10"
  					android:hint="@string/auth_username"
 -					android:inputType="textNoSuggestions" />
 +					android:inputType="textNoSuggestions"
 +					android:contentDescription="@string/auth_username"/>
  		
  				<EditText
  				    android:id="@+id/account_password"
@@@ -176,7 -168,6 +176,7 @@@
  					android:hint="@string/auth_password"
  					android:inputType="textPassword"
  					android:drawablePadding="5dp"
 +					android:contentDescription="@string/auth_password"
  					/>
  		        
  				<TextView
@@@ -187,7 -178,6 +187,7 @@@
  					android:text="@string/auth_unauthorized"
  					android:drawableLeft="@android:drawable/stat_notify_sync"
  					android:drawablePadding="5dip"
 +                    android:contentDescription="@string/auth_unauthorized"
  					/>
  
  			</LinearLayout>
@@@ -210,8 -200,7 +210,8 @@@
  		    android:layout_gravity="center_horizontal"
  		    android:enabled="false"
  		    android:onClick="onOkClick"
 -		    android:text="@string/setup_btn_connect" />
 +		    android:text="@string/setup_btn_connect"
 +            android:contentDescription="@string/setup_btn_connect"/>
  		
  		<Button
  		    android:id="@+id/welcome_link"
@@@ -223,8 -212,7 +223,8 @@@
  		    android:paddingBottom="5dp"
  		    android:paddingTop="5dp"
  		    android:text="@string/auth_register"
 -		    android:textColor="#0000FF"/>
 +		    android:textColor="#0000FF"
 +            android:contentDescription="@string/auth_register"/>
  	</LinearLayout>
  		
  </RelativeLayout>
diff --combined res/layout/account_setup.xml
index 1e587645,830dd55e..1f712ee8
--- a/res/layout/account_setup.xml
+++ b/res/layout/account_setup.xml
@@@ -3,7 -3,7 +3,7 @@@
    ownCloud Android client application
  
    Copyright (C) 2012  Bartek Przybylski
-   Copyright (C) 2012-2013 ownCloud Inc.
+   Copyright (C) 2015 ownCloud Inc.
  
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License version 2,
@@@ -35,14 -35,13 +35,14 @@@
          android:padding="8dp" >
  
          <ImageView
-             android:id="@+id/imageView1"
+             android:id="@+id/thumbnail"
              android:layout_width="match_parent"
              android:layout_height="wrap_content"
              android:layout_marginBottom="10dp"
              android:layout_marginTop="10dp"
              android:background="@color/login_logo_background_color"
 -            android:src="@drawable/logo" />
 +            android:src="@drawable/logo"
 +            android:contentDescription="@string/app_name"/>
  
          <Button
              android:id="@+id/centeredRefreshButton"
@@@ -52,8 -51,7 +52,8 @@@
              android:layout_marginBottom="10dp"
              android:onClick="onRefreshClick"
              android:text="@string/auth_check_server"
 -            android:visibility="gone" />
 +            android:visibility="gone"
 +            android:contentDescription="@string/auth_check_server"/>
          
          <TextView
              android:id="@+id/instructions_message"
@@@ -62,8 -60,7 +62,8 @@@
              android:layout_gravity="fill_horizontal"
              android:text="@string/auth_expired_basic_auth_toast"
              android:visibility="gone"
 -            android:layout_marginBottom="10dp" />
 +            android:layout_marginBottom="10dp"
 +            android:contentDescription="@string/auth_expired_basic_auth_toast"/>
  
  	    <FrameLayout 
  	        android:id="@+id/hostUrlFrame"
@@@ -80,7 -77,6 +80,7 @@@
  				android:inputType="textUri"
  				android:drawablePadding="5dp"
  				android:paddingRight="55dp"
 +				android:contentDescription="@string/auth_host_address"
  				>
  				<requestFocus />
  			</EditText>
@@@ -96,7 -92,6 +96,7 @@@
              	android:onClick="onRefreshClick"
  				android:visibility="gone"
  				android:background="@android:color/transparent"
 +                android:contentDescription="@string/auth_refresh_button"
  			    />
  		</FrameLayout>
  
@@@ -108,8 -103,7 +108,8 @@@
              android:drawableLeft="@android:drawable/stat_notify_sync"
              android:drawablePadding="5dp"
              android:gravity="center_vertical"
 -            android:text="@string/auth_testing_connection" />
 +            android:text="@string/auth_testing_connection"
 +            android:contentDescription="@string/auth_testing_connection"/>
  
          <CheckBox
              android:id="@+id/oauth_onOff_check"
@@@ -119,7 -113,6 +119,7 @@@
              android:onClick="onCheckClick"
              android:text="@string/oauth_check_onoff"
              android:textAppearance="?android:attr/textAppearanceSmall"
 +            android:contentDescription="@string/oauth_check_onoff"
              />
  
          <EditText
@@@ -131,7 -124,7 +131,7 @@@
              android:text="@string/oauth2_url_endpoint_auth"
              android:singleLine="true"
              android:inputType="textUri"
 -            android:visibility="gone" >
 +            android:visibility="gone">
          </EditText>
  
          <EditText
@@@ -143,7 -136,7 +143,7 @@@
              android:text="@string/oauth2_url_endpoint_access"
              android:singleLine="true"
              android:inputType="textUri"
 -            android:visibility="gone" />
 +            android:visibility="gone"/>
  
          <EditText
              android:id="@+id/account_username"
@@@ -151,8 -144,7 +151,8 @@@
              android:layout_height="wrap_content"
              android:ems="10"
              android:hint="@string/auth_username"
 -            android:inputType="textNoSuggestions" 
 +            android:inputType="textNoSuggestions"
 +            android:contentDescription="@string/auth_username"
  			/>
  
  		<EditText
@@@ -162,8 -154,7 +162,8 @@@
  		    android:drawablePadding="5dp"
  		    android:ems="10"
  		    android:hint="@string/auth_password"
 -		    android:inputType="textPassword" 
 +		    android:inputType="textPassword"
 +		    android:contentDescription="@string/auth_password"
              />
          
          <TextView
@@@ -174,8 -165,7 +174,8 @@@
              android:drawableLeft="@android:drawable/stat_notify_sync"
              android:drawablePadding="5dp"
              android:gravity="center_vertical"
 -            android:text="@string/auth_unauthorized" />
 +            android:text="@string/auth_unauthorized"
 +            android:contentDescription="@string/auth_unauthorized"/>
  
          <Button
              android:id="@+id/buttonOK"
@@@ -184,8 -174,7 +184,8 @@@
              android:layout_gravity="center_horizontal"
              android:enabled="false"
              android:onClick="onOkClick"
 -            android:text="@string/setup_btn_connect" />
 +            android:text="@string/setup_btn_connect"
 +            android:contentDescription="@string/setup_btn_connect"/>
  
          <Button
              android:id="@+id/welcome_link"
@@@ -196,8 -185,7 +196,8 @@@
              android:paddingBottom="5dp"
              android:paddingTop="5dp"
              android:text="@string/auth_register"
 -            android:textColor="#0000FF"/>
 +            android:textColor="#0000FF"
 +            android:contentDescription="@string/auth_register"/>
  
      </LinearLayout>
  
diff --combined res/menu/main_menu.xml
index 07056010,4f1f890c..d35eba01
--- a/res/menu/main_menu.xml
+++ b/res/menu/main_menu.xml
@@@ -3,7 -3,7 +3,7 @@@
    ownCloud Android client application
  
    Copyright (C) 2012  Bartek Przybylski
-   Copyright (C) 2012-2013 ownCloud Inc.
+   Copyright (C) 2015 ownCloud Inc.
  
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License version 2,
@@@ -24,43 -24,37 +24,43 @@@
          android:icon="@drawable/ic_action_upload"
          android:orderInCategory="2"
          android:showAsAction="always"
 -        android:title="@string/actionbar_upload"/>
 +        android:title="@string/actionbar_upload"
 +        android:contentDescription="@string/actionbar_upload"/>
      <item
          android:id="@+id/action_create_dir"
          android:icon="@drawable/ic_action_create_dir"
          android:orderInCategory="2"
          android:showAsAction="always"
 -        android:title="@string/actionbar_mkdir"/>
 +        android:title="@string/actionbar_mkdir"
 +        android:contentDescription="@string/actionbar_mkdir"/>
      <item
          android:id="@+id/action_sync_account"
          android:icon="@drawable/ic_action_refresh"
          android:orderInCategory="2"
          android:showAsAction="never"
 -        android:title="@string/actionbar_sync"/>
 +        android:title="@string/actionbar_sync"
 +        android:contentDescription="@string/actionbar_sync"/>
      <item
          android:id="@+id/action_settings"
          android:icon="@drawable/ic_action_settings"
          android:orderInCategory="2"
          android:showAsAction="never"
 -        android:title="@string/actionbar_settings"/>
 +        android:title="@string/actionbar_settings"
 +        android:contentDescription="@string/actionbar_settings"/>
      <item
          android:id="@+id/action_logger"
          android:icon="@drawable/ic_action_settings"
          android:orderInCategory="2"
          android:showAsAction="never"
 -        android:title="@string/actionbar_logger"/>
 +        android:title="@string/actionbar_logger"
 +        android:contentDescription="@string/actionbar_logger"/>
  	<item
          android:id="@+id/action_sort"
          android:icon="@android:drawable/ic_menu_sort_alphabetically"
          android:orderInCategory="2"
          android:showAsAction="never"
 -        android:title="@string/actionbar_sort"/>
 +        android:title="@string/actionbar_sort"
 +        android:contentDescription="@string/actionbar_sort"/>
  
      <!-- <item android:id="@+id/search" android:title="@string/actionbar_search" android:icon="@drawable/ic_action_search"></item> -->
  
diff --combined res/values/strings.xml
index 1fc4d8ee,1ad9d8d3..8f2898cb
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@@ -166,7 -166,7 +166,7 @@@
  	<string name="auth_no_net_conn_title">No network connection</string>
  	<string name="auth_nossl_plain_ok_title">Secure connection unavailable.</string>
  	<string name="auth_connection_established">Connection established</string>
 -	<string name="auth_testing_connection">Testing connection&#8230;</string>
 +	<string name="auth_testing_connection">Testing connection</string>
  	<string name="auth_not_configured_title">Malformed server configuration</string>
  	<string name="auth_account_not_new">An account for the same user and server already exists in the device</string>
  	<string name="auth_account_not_the_same">The entered user does not match the user of this account</string>
@@@ -193,6 -193,7 +193,7 @@@
  	<string name="auth_fail_get_user_name">Your server is not returning a correct user id, please contact an administrator
  	</string>
  	<string name="auth_can_not_auth_against_server">Cannot authenticate against this server</string>
+     <string name="auth_account_does_not_exist">Account does not exist in the device yet</string>
      
      <string name="fd_keep_in_sync">Keep file up to date</string>
      <string name="common_rename">Rename</string>
@@@ -324,8 -325,8 +325,11 @@@
  	<string name="prefs_category_security">Security</string>
  
  	<string name="prefs_instant_video_upload_path_title">Upload Video Path</string>
+     <string name="download_folder_failed_content">Download of %1$s folder could not be completed</string>
+ 
+ 	<string name="subject_token">%1$s shared \"%2$s\" with you</string>
  
 +    <string name="auth_refresh_button">Refresh connection</string>
 +    <string name="auth_host_address">Server address</string>
 +
  </resources>
diff --combined src/com/owncloud/android/ui/activity/FileDisplayActivity.java
index ea65d31a,16c09edd..58e7ec5e
--- a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
+++ b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
@@@ -1,6 -1,10 +1,10 @@@
- /* ownCloud Android client application
+ /**
+  *   ownCloud Android client application
+  *
+  *   @author Bartek Przybylski
+  *   @author David A. Velasco
   *   Copyright (C) 2011  Bartek Przybylski
-  *   Copyright (C) 2012-2014 ownCloud Inc.
+  *   Copyright (C) 2015 ownCloud Inc.
   *
   *   This program is free software: you can redistribute it and/or modify
   *   it under the terms of the GNU General Public License version 2,
@@@ -25,6 -29,8 +29,8 @@@ import android.accounts.Account
  import android.accounts.AccountManager;
  import android.accounts.AuthenticatorException;
  import android.accounts.OperationCanceledException;
+ import android.annotation.SuppressLint;
+ import android.annotation.TargetApi;
  import android.app.AlertDialog;
  import android.app.Dialog;
  import android.app.ProgressDialog;
@@@ -90,11 -96,10 +96,10 @@@ import com.owncloud.android.operations.
  import com.owncloud.android.operations.RemoveFileOperation;
  import com.owncloud.android.operations.RenameFileOperation;
  import com.owncloud.android.operations.SynchronizeFileOperation;
- import com.owncloud.android.operations.SynchronizeFolderOperation;
+ import com.owncloud.android.operations.RefreshFolderOperation;
  import com.owncloud.android.operations.UnshareLinkOperation;
  import com.owncloud.android.services.observer.FileObserverService;
  import com.owncloud.android.syncadapter.FileSyncAdapter;
- import com.owncloud.android.ui.adapter.FileListListAdapter;
  import com.owncloud.android.ui.dialog.CreateFolderDialogFragment;
  import com.owncloud.android.ui.dialog.SslUntrustedCertDialog;
  import com.owncloud.android.ui.dialog.SslUntrustedCertDialog.OnSslUntrustedCertListener;
@@@ -107,14 -112,12 +112,12 @@@ import com.owncloud.android.ui.preview.
  import com.owncloud.android.ui.preview.PreviewVideoActivity;
  import com.owncloud.android.utils.DisplayUtils;
  import com.owncloud.android.utils.ErrorMessageAdapter;
+ import com.owncloud.android.utils.FileStorageUtils;
  import com.owncloud.android.utils.UriUtils;
  
  
  /**
   * Displays, what files the user has available in his ownCloud.
-  * 
-  * @author Bartek Przybylski
-  * @author David A. Velasco
   */
  
  public class FileDisplayActivity extends HookActivity implements
@@@ -253,7 -256,7 +256,7 @@@ OnSslUntrustedCertListener, OnEnforceab
              setNavigationListWithFolder(file);
              
              if (!stateWasRecovered) {
-                 Log_OC.e(TAG, "Initializing Fragments in onAccountChanged..");
+                 Log_OC.d(TAG, "Initializing Fragments in onAccountChanged..");
                  initFragmentsWithFile();
                  if (file.isFolder()) {
                      startSyncFolderOperation(file, false);
@@@ -517,7 -520,7 +520,7 @@@
              
              // Read sorting order, default to sort by name ascending
              Integer sortOrder = appPreferences
-                     .getInt("sortOrder", FileListListAdapter.SORT_NAME);
+                     .getInt("sortOrder", FileStorageUtils.SORT_NAME);
              
              AlertDialog.Builder builder = new AlertDialog.Builder(this);
              builder.setTitle(R.string.actionbar_sort_title)
@@@ -552,19 -555,19 +555,19 @@@
      }
  
      private void startSynchronization() {
-         Log_OC.e(TAG, "Got to start sync");
+         Log_OC.d(TAG, "Got to start sync");
          if (android.os.Build.VERSION.SDK_INT < android.os.Build.VERSION_CODES.KITKAT) {
-             Log_OC.e(TAG, "Canceling all syncs for " + MainApp.getAuthority());
+             Log_OC.d(TAG, "Canceling all syncs for " + MainApp.getAuthority());
              ContentResolver.cancelSync(null, MainApp.getAuthority());   // cancel the current synchronizations of any ownCloud account
              Bundle bundle = new Bundle();
              bundle.putBoolean(ContentResolver.SYNC_EXTRAS_MANUAL, true);
              bundle.putBoolean(ContentResolver.SYNC_EXTRAS_EXPEDITED, true);
-             Log_OC.e(TAG, "Requesting sync for " + getAccount().name + " at " + MainApp.getAuthority());
+             Log_OC.d(TAG, "Requesting sync for " + getAccount().name + " at " + MainApp.getAuthority());
              ContentResolver.requestSync(
                      getAccount(),
                      MainApp.getAuthority(), bundle);
          } else {
-             Log_OC.e(TAG, "Requesting sync for " + getAccount().name + " at " + MainApp.getAuthority() + " with new API");
+             Log_OC.d(TAG, "Requesting sync for " + getAccount().name + " at " + MainApp.getAuthority() + " with new API");
              SyncRequest.Builder builder = new SyncRequest.Builder();
              builder.setSyncAdapter(getAccount(), MainApp.getAuthority());
              builder.setExpedited(true);
@@@ -605,13 -608,23 +608,23 @@@
  
      /**
       * Called, when the user selected something for uploading
+      *
       */
+     @TargetApi(Build.VERSION_CODES.JELLY_BEAN)
      protected void onActivityResult(int requestCode, int resultCode, Intent data) {
          super.onActivityResult(requestCode, resultCode, data);
  
          if (requestCode == ACTION_SELECT_CONTENT_FROM_APPS && (resultCode == RESULT_OK || resultCode == UploadFilesActivity.RESULT_OK_AND_MOVE)) {
-             requestSimpleUpload(data, resultCode);
- 
+             //getClipData is only supported on api level 16+, Jelly Bean
+             if (data.getData() == null && Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN){
+                 for( int i = 0; i < data.getClipData().getItemCount(); i++){
+                     Intent intent = new Intent();
+                     intent.setData(data.getClipData().getItemAt(i).getUri());
+                     requestSimpleUpload(intent, resultCode);
+                 }
+             }else {
+                 requestSimpleUpload(data, resultCode);
+             }
          } else if (requestCode == ACTION_SELECT_MULTIPLE_FILES && (resultCode == RESULT_OK || resultCode == UploadFilesActivity.RESULT_OK_AND_MOVE)) {
              requestMultipleUpload(data, resultCode);
  
@@@ -636,6 -649,7 +649,7 @@@
          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);
              }
@@@ -686,7 -700,7 +700,7 @@@
  
          } finally {
              if (filepath == null) {
-                 Log_OC.e(TAG, "Couldnt resolve path to file");
+                 Log_OC.e(TAG, "Couldn't resolve path to file");
                  Toast t = Toast.makeText(this, getString(R.string.filedisplay_unexpected_bad_get_content), Toast.LENGTH_LONG);
                  t.show();
                  return;
@@@ -773,7 -787,7 +787,7 @@@
      @Override
      protected void onSaveInstanceState(Bundle outState) {
          // responsibility of restore is preferred in onCreate() before than in onRestoreInstanceState when there are Fragments involved
-         Log_OC.e(TAG, "onSaveInstanceState() start");
+         Log_OC.d(TAG, "onSaveInstanceState() start");
          super.onSaveInstanceState(outState);
          outState.putParcelable(FileDisplayActivity.KEY_WAITING_TO_PREVIEW, mWaitingToPreview);
          outState.putBoolean(FileDisplayActivity.KEY_SYNC_IN_PROGRESS, mSyncInProgress);
@@@ -788,7 -802,7 +802,7 @@@
      @Override
      protected void onResume() {
          super.onResume();
-         Log_OC.e(TAG, "onResume() start");
+         Log_OC.d(TAG, "onResume() start");
          
          // refresh list of files
          refreshListOfFilesFragment();
@@@ -797,8 -811,8 +811,8 @@@
          IntentFilter syncIntentFilter = new IntentFilter(FileSyncAdapter.EVENT_FULL_SYNC_START);
          syncIntentFilter.addAction(FileSyncAdapter.EVENT_FULL_SYNC_END);
          syncIntentFilter.addAction(FileSyncAdapter.EVENT_FULL_SYNC_FOLDER_CONTENTS_SYNCED);
-         syncIntentFilter.addAction(SynchronizeFolderOperation.EVENT_SINGLE_FOLDER_CONTENTS_SYNCED);
-         syncIntentFilter.addAction(SynchronizeFolderOperation.EVENT_SINGLE_FOLDER_SHARES_SYNCED);
+         syncIntentFilter.addAction(RefreshFolderOperation.EVENT_SINGLE_FOLDER_CONTENTS_SYNCED);
+         syncIntentFilter.addAction(RefreshFolderOperation.EVENT_SINGLE_FOLDER_SHARES_SYNCED);
          mSyncBroadcastReceiver = new SyncBroadcastReceiver();
          registerReceiver(mSyncBroadcastReceiver, syncIntentFilter);
          //LocalBroadcastManager.getInstance(this).registerReceiver(mSyncBroadcastReceiver, syncIntentFilter);
@@@ -820,7 -834,7 +834,7 @@@
  
      @Override
      protected void onPause() {
-         Log_OC.e(TAG, "onPause() start");
+         Log_OC.d(TAG, "onPause() start");
          if (mSyncBroadcastReceiver != null) {
              unregisterReceiver(mSyncBroadcastReceiver);
              //LocalBroadcastManager.getInstance(this).unregisterReceiver(mSyncBroadcastReceiver);
@@@ -877,6 -891,10 +891,10 @@@
                      } else if (item == 1) {
                          Intent action = new Intent(Intent.ACTION_GET_CONTENT);
                          action = action.setType("*/*").addCategory(Intent.CATEGORY_OPENABLE);
+                         //Intent.EXTRA_ALLOW_MULTIPLE is only supported on api level 18+, Jelly Bean
+                         if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2) {
+                             action.putExtra(Intent.EXTRA_ALLOW_MULTIPLE, true);
+                         }
                          startActivityForResult(Intent.createChooser(action, getString(R.string.upload_chooser_title)),
                                  ACTION_SELECT_CONTENT_FROM_APPS);
                      }
@@@ -1082,9 -1100,9 +1100,9 @@@
                              setFile(currentFile);
                          }
                          
-                         mSyncInProgress = (!FileSyncAdapter.EVENT_FULL_SYNC_END.equals(event) && !SynchronizeFolderOperation.EVENT_SINGLE_FOLDER_SHARES_SYNCED.equals(event));
+                         mSyncInProgress = (!FileSyncAdapter.EVENT_FULL_SYNC_END.equals(event) && !RefreshFolderOperation.EVENT_SINGLE_FOLDER_SHARES_SYNCED.equals(event));
                                  
-                         if (SynchronizeFolderOperation.EVENT_SINGLE_FOLDER_CONTENTS_SYNCED.
+                         if (RefreshFolderOperation.EVENT_SINGLE_FOLDER_CONTENTS_SYNCED.
                                      equals(event) &&
                                  /// TODO refactor and make common
                                  synchResult != null && !synchResult.isSuccess() &&  
@@@ -1093,40 -1111,34 +1111,34 @@@
                                      (synchResult.isException() && synchResult.getException() 
                                              instanceof AuthenticatorException))) {
  
-                             OwnCloudClient client = null;
+ 
                              try {
-                                 OwnCloudAccount ocAccount = 
+                                 OwnCloudClient client;
+                                 OwnCloudAccount ocAccount =
                                          new OwnCloudAccount(getAccount(), context);
                                  client = (OwnCloudClientManagerFactory.getDefaultSingleton().
                                          removeClientFor(ocAccount));
-                                 // TODO get rid of these exceptions
-                             } catch (AccountNotFoundException e) {
-                                 e.printStackTrace();
-                             } catch (AuthenticatorException e) {
-                                 e.printStackTrace();
-                             } catch (OperationCanceledException e) {
-                                 e.printStackTrace();
-                             } catch (IOException e) {
-                                 e.printStackTrace();
-                             }
-                             
-                             if (client != null) {
-                                 OwnCloudCredentials cred = client.getCredentials();
-                                 if (cred != null) {
-                                     AccountManager am = AccountManager.get(context);
-                                     if (cred.authTokenExpires()) {
-                                         am.invalidateAuthToken(
-                                                 getAccount().type, 
-                                                 cred.getAuthToken()
-                                         );
-                                     } else {
-                                         am.clearPassword(getAccount());
+ 
+                                 if (client != null) {
+                                     OwnCloudCredentials cred = client.getCredentials();
+                                     if (cred != null) {
+                                         AccountManager am = AccountManager.get(context);
+                                         if (cred.authTokenExpires()) {
+                                             am.invalidateAuthToken(
+                                                     getAccount().type,
+                                                     cred.getAuthToken()
+                                             );
+                                         } else {
+                                             am.clearPassword(getAccount());
+                                         }
                                      }
                                  }
+                                 requestCredentialsUpdate();
+ 
+                             } catch (AccountNotFoundException e) {
+                                 Log_OC.e(TAG, "Account " + getAccount() + " was removed!", e);
                              }
-                             
-                             requestCredentialsUpdate();
-                             
+ 
                          }
                      }
                      removeStickyBroadcast(intent);
@@@ -1238,26 -1250,36 +1250,36 @@@
  
  
      /**
-      * Class waiting for broadcast events from the {@link FielDownloader} service.
+      * Class waiting for broadcast events from the {@link FileDownloader} 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 {
+ 
+         //int refreshCounter = 0;
          @Override
          public void onReceive(Context context, Intent intent) {
              try {
                  boolean sameAccount = isSameAccount(context, intent);
                  String downloadedRemotePath = intent.getStringExtra(FileDownloader.EXTRA_REMOTE_PATH);
                  boolean isDescendant = isDescendant(downloadedRemotePath);
-     
+ 
                  if (sameAccount && isDescendant) {
-                     refreshListOfFilesFragment();
-                     refreshSecondFragment(intent.getAction(), downloadedRemotePath, intent.getBooleanExtra(FileDownloader.EXTRA_DOWNLOAD_RESULT, false));
+                     String linkedToRemotePath = intent.getStringExtra(FileDownloader.EXTRA_LINKED_TO_PATH);
+                     if (linkedToRemotePath == null || isAscendant(linkedToRemotePath)) {
+                         //Log_OC.v(TAG, "refresh #" + ++refreshCounter);
+                         refreshListOfFilesFragment();
+                     }
+                     refreshSecondFragment(
+                             intent.getAction(),
+                             downloadedRemotePath,
+                             intent.getBooleanExtra(FileDownloader.EXTRA_DOWNLOAD_RESULT, false)
+                     );
                  }
      
                  if (mWaitingToSend != null) {
-                     mWaitingToSend = getStorageManager().getFileByPath(mWaitingToSend.getRemotePath()); // Update the file to send
+                     mWaitingToSend = getStorageManager().getFileByPath(mWaitingToSend.getRemotePath());
                      if (mWaitingToSend.isDown()) { 
                          sendDownloadedFile();
                      }
@@@ -1272,7 -1294,19 +1294,19 @@@
  
          private boolean isDescendant(String downloadedRemotePath) {
              OCFile currentDir = getCurrentDir();
-             return (currentDir != null && downloadedRemotePath != null && downloadedRemotePath.startsWith(currentDir.getRemotePath()));
+             return (
+                 currentDir != null &&
+                 downloadedRemotePath != null &&
+                 downloadedRemotePath.startsWith(currentDir.getRemotePath())
+             );
+         }
+ 
+         private boolean isAscendant(String linkedToRemotePath) {
+             OCFile currentDir = getCurrentDir();
+             return (
+                 currentDir != null &&
+                 currentDir.getRemotePath().startsWith(linkedToRemotePath)
+             );
          }
  
          private boolean isSameAccount(Context context, Intent intent) {
@@@ -1349,11 -1383,7 +1383,11 @@@
       * TODO
       */
      private void updateNavigationElementsInActionBar(OCFile chosenFile) {
 -        ActionBar actionBar = getSupportActionBar(); 
 +        ActionBar actionBar = getSupportActionBar();
 +
 +        // For adding content description tag to a title field in the action bar
 +        int actionBarTitleId = getResources().getIdentifier("action_bar_title", "id", "android");
 +
          if (chosenFile == null || mDualPane) {
              // only list of files - set for browsing through folders
              OCFile currentDir = getCurrentDir();
@@@ -1362,7 -1392,6 +1396,7 @@@
              actionBar.setDisplayShowTitleEnabled(!noRoot); 
              if (!noRoot) {
                  actionBar.setTitle(getString(R.string.default_display_name_for_root_folder));
 +                getWindow().getDecorView().findViewById(actionBarTitleId).setContentDescription(getString(R.string.default_display_name_for_root_folder));
              }
              actionBar.setNavigationMode(!noRoot ? ActionBar.NAVIGATION_MODE_STANDARD : ActionBar.NAVIGATION_MODE_LIST);
              actionBar.setListNavigationCallbacks(mDirectories, this);   // assuming mDirectories is updated
@@@ -1372,7 -1401,6 +1406,7 @@@
              actionBar.setDisplayShowTitleEnabled(true);
              actionBar.setTitle(chosenFile.getFileName());
              actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_STANDARD);
 +            getWindow().getDecorView().findViewById(actionBarTitleId).setContentDescription(chosenFile.getFileName());
          }
      }
  
@@@ -1714,6 -1742,7 +1748,7 @@@
  
      private void requestForDownload() {
          Account account = getAccount();
+         //if (!mWaitingToPreview.isDownloading()) {
          if (!mDownloaderBinder.isDownloading(account, mWaitingToPreview)) {
              Intent i = new Intent(this, FileDownloader.class);
              i.putExtra(FileDownloader.EXTRA_ACCOUNT, account);
@@@ -1742,7 -1771,7 +1777,7 @@@
          mSyncInProgress = true;
                  
          // perform folder synchronization
-         RemoteOperation synchFolderOp = new SynchronizeFolderOperation( folder,  
+         RemoteOperation synchFolderOp = new RefreshFolderOperation( folder,
                                                                          currentSyncTime, 
                                                                          false,
                                                                          getFileOperationsHelper().isSharedSupported(),
@@@ -1771,7 -1800,7 +1806,7 @@@
      
      private void requestForDownload(OCFile file) {
          Account account = getAccount();
-         if (!mDownloaderBinder.isDownloading(account, file)) {
+         if (!mDownloaderBinder.isDownloading(account, mWaitingToPreview)) {
              Intent i = new Intent(this, FileDownloader.class);
              i.putExtra(FileDownloader.EXTRA_ACCOUNT, account);
              i.putExtra(FileDownloader.EXTRA_FILE, file);
diff --combined src/com/owncloud/android/ui/activity/Preferences.java
index 7942a73f,d71968a7..2eb48fab
--- a/src/com/owncloud/android/ui/activity/Preferences.java
+++ b/src/com/owncloud/android/ui/activity/Preferences.java
@@@ -1,6 -1,10 +1,10 @@@
- /* ownCloud Android client application
+ /**
+  *   ownCloud Android client application
+  *
+  *   @author Bartek Przybylski
+  *   @author David A. Velasco
   *   Copyright (C) 2011  Bartek Przybylski
-  *   Copyright (C) 2012-2013 ownCloud Inc.
+  *   Copyright (C) 2015 ownCloud Inc.
   *
   *   This program is free software: you can redistribute it and/or modify
   *   it under the terms of the GNU General Public License version 2,
@@@ -21,13 -25,17 +25,17 @@@ import android.accounts.Account
  import android.accounts.AccountManager;
  import android.accounts.AccountManagerCallback;
  import android.accounts.AccountManagerFuture;
+ import android.content.ComponentName;
+ import android.content.Context;
  import android.content.Intent;
+ import android.content.ServiceConnection;
  import android.content.SharedPreferences;
  import android.content.pm.PackageInfo;
  import android.content.pm.PackageManager.NameNotFoundException;
  import android.net.Uri;
  import android.os.Bundle;
  import android.os.Handler;
+ import android.os.IBinder;
  import android.preference.CheckBoxPreference;
  import android.preference.Preference;
  import android.preference.Preference.OnPreferenceChangeListener;
@@@ -50,20 -58,25 +58,25 @@@ import com.owncloud.android.MainApp
  import com.owncloud.android.R;
  import com.owncloud.android.authentication.AccountUtils;
  import com.owncloud.android.authentication.AuthenticatorActivity;
+ import com.owncloud.android.datamodel.FileDataStorageManager;
  import com.owncloud.android.datamodel.OCFile;
  import com.owncloud.android.db.DbHandler;
+ import com.owncloud.android.files.FileOperationsHelper;
+ import com.owncloud.android.files.services.FileDownloader;
+ import com.owncloud.android.files.services.FileUploader;
  import com.owncloud.android.lib.common.utils.Log_OC;
+ import com.owncloud.android.services.OperationsService;
  import com.owncloud.android.ui.RadioButtonPreference;
  import com.owncloud.android.utils.DisplayUtils;
  
+ import java.io.File;
+ 
  
  /**
   * An Activity that allows the user to change the application's settings.
-  * 
-  * @author Bartek Przybylski
-  * @author David A. Velasco
   */
- public class Preferences extends SherlockPreferenceActivity implements AccountManagerCallback<Boolean> {
+ public class Preferences extends SherlockPreferenceActivity
+         implements AccountManagerCallback<Boolean>, ComponentsGetter {
      
      private static final String TAG = "OwnCloudPreferences";
  
@@@ -79,10 -92,18 +92,18 @@@
      private String mAccountName;
      private boolean mShowContextMenu = false;
      private String mUploadPath;
+     private PreferenceCategory mPrefInstantUploadCategory;
+     private Preference mPrefInstantUpload;
      private Preference mPrefInstantUploadPath;
+     private Preference mPrefInstantUploadPathWiFi;
+     private Preference mPrefInstantVideoUpload;
      private Preference mPrefInstantVideoUploadPath;
+     private Preference mPrefInstantVideoUploadPathWiFi;
      private String mUploadVideoPath;
  
+     protected FileDownloader.FileDownloaderBinder mDownloaderBinder = null;
+     protected FileUploader.FileUploaderBinder mUploaderBinder = null;
+     private ServiceConnection mDownloadServiceConnection, mUploadServiceConnection = null;
  
      @SuppressWarnings("deprecation")
      @Override
@@@ -96,10 -117,6 +117,10 @@@
          actionBar.setDisplayHomeAsUpEnabled(true);
          actionBar.setTitle(R.string.actionbar_settings);
  
 +        // For adding content description tag to a title field in the action bar
 +        int actionBarTitleId = getResources().getIdentifier("action_bar_title", "id", "android");
 +        getWindow().getDecorView().findViewById(actionBarTitleId).setContentDescription(getString(R.string.actionbar_settings));
 +
          // Load the accounts category for adding the list of accounts
          mAccountsPrefCategory = (PreferenceCategory) findPreference("accounts_category");
  
@@@ -198,13 -215,13 +219,13 @@@
                          String username = currentAccount.name.substring(0, currentAccount.name.lastIndexOf('@'));
                          
                          String recommendSubject = String.format(getString(R.string.recommend_subject), appName);
-                         String recommendText = String.format(getString(R.string.recommend_text), appName, downloadUrl, username);
+                         String recommendText = String.format(getString(R.string.recommend_text),
+                                 appName, downloadUrl, username);
                          
                          intent.putExtra(Intent.EXTRA_SUBJECT, recommendSubject);
                          intent.putExtra(Intent.EXTRA_TEXT, recommendText);
                          startActivity(intent);
  
- 
                          return(true);
  
                      }
@@@ -279,7 -296,23 +300,23 @@@
                      }
                  });
          }
- 
+         
+         mPrefInstantUploadCategory = (PreferenceCategory) findPreference("instant_uploading_category");
+         
+         mPrefInstantUploadPathWiFi =  findPreference("instant_upload_on_wifi");
+         mPrefInstantUpload = findPreference("instant_uploading");
+         
+         toggleInstantPictureOptions(((CheckBoxPreference) mPrefInstantUpload).isChecked());
+         
+         mPrefInstantUpload.setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
+             
+             @Override
+             public boolean onPreferenceChange(Preference preference, Object newValue) {
+                 toggleInstantPictureOptions((Boolean) newValue);
+                 return true;
+             }
+         });
+        
          mPrefInstantVideoUploadPath =  findPreference("instant_video_upload_path");
          if (mPrefInstantVideoUploadPath != null){
  
@@@ -296,6 -329,19 +333,19 @@@
                      }
                  });
          }
+         
+         mPrefInstantVideoUploadPathWiFi =  findPreference("instant_video_upload_on_wifi");
+         mPrefInstantVideoUpload = findPreference("instant_video_uploading");
+         toggleInstantVideoOptions(((CheckBoxPreference) mPrefInstantVideoUpload).isChecked());
+         
+         mPrefInstantVideoUpload.setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
+             
+             @Override
+             public boolean onPreferenceChange(Preference preference, Object newValue) {
+                 toggleInstantVideoOptions((Boolean) newValue);
+                 return true;
+             }
+         });
              
          /* About App */
         pAboutApp = (Preference) findPreference("about_app");
@@@ -307,6 -353,38 +357,38 @@@
         loadInstantUploadPath();
         loadInstantUploadVideoPath();
  
+         /* ComponentsGetter */
+         mDownloadServiceConnection = newTransferenceServiceConnection();
+         if (mDownloadServiceConnection != null) {
+             bindService(new Intent(this, FileDownloader.class), mDownloadServiceConnection,
+                     Context.BIND_AUTO_CREATE);
+         }
+         mUploadServiceConnection = newTransferenceServiceConnection();
+         if (mUploadServiceConnection != null) {
+             bindService(new Intent(this, FileUploader.class), mUploadServiceConnection,
+                     Context.BIND_AUTO_CREATE);
+         }
+ 
+     }
+     
+     private void toggleInstantPictureOptions(Boolean value){
+         if (value){
+             mPrefInstantUploadCategory.addPreference(mPrefInstantUploadPathWiFi);
+             mPrefInstantUploadCategory.addPreference(mPrefInstantUploadPath);
+         } else {
+             mPrefInstantUploadCategory.removePreference(mPrefInstantUploadPathWiFi);
+             mPrefInstantUploadCategory.removePreference(mPrefInstantUploadPath);
+         }
+     }
+     
+     private void toggleInstantVideoOptions(Boolean value){
+         if (value){
+             mPrefInstantUploadCategory.addPreference(mPrefInstantVideoUploadPathWiFi);
+             mPrefInstantUploadCategory.addPreference(mPrefInstantVideoUploadPath);
+         } else {
+             mPrefInstantUploadCategory.removePreference(mPrefInstantVideoUploadPathWiFi);
+             mPrefInstantUploadCategory.removePreference(mPrefInstantVideoUploadPath);
+         }
      }
  
      @Override
@@@ -352,6 -430,7 +434,7 @@@
  
                      // Remove account
                      am.removeAccount(a, this, mHandler);
+                     Log_OC.d(TAG, "Remove an account " + a.name);
                  }
              }
          }
@@@ -362,6 -441,18 +445,18 @@@
      @Override
      public void run(AccountManagerFuture<Boolean> future) {
          if (future.isDone()) {
+             // after remove account
+             Account account = new Account(mAccountName, MainApp.getAccountType());
+             if (!AccountUtils.exists(account, MainApp.getAppContext())) {
+                 // Cancel tranfers
+                 if (mUploaderBinder != null) {
+                     mUploaderBinder.cancel(account);
+                 }
+                 if (mDownloaderBinder != null) {
+                     mDownloaderBinder.cancel(account);
+                 }
+             }
+ 
              Account a = AccountUtils.getCurrentOwnCloudAccount(this);
              String accountName = "";
              if (a == null) {
@@@ -444,6 -535,16 +539,16 @@@
      @Override
      protected void onDestroy() {
          mDbHandler.close();
+ 
+         if (mDownloadServiceConnection != null) {
+             unbindService(mDownloadServiceConnection);
+             mDownloadServiceConnection = null;
+         }
+         if (mUploadServiceConnection != null) {
+             unbindService(mUploadServiceConnection);
+             mUploadServiceConnection = null;
+         }
+ 
          super.onDestroy();
      }
  
@@@ -587,4 -688,65 +692,65 @@@
          editor.putString("instant_video_upload_path", mUploadVideoPath);
          editor.commit();
      }
+ 
+     // Methods for ComponetsGetter
+     @Override
+     public FileDownloader.FileDownloaderBinder getFileDownloaderBinder() {
+         return mDownloaderBinder;
+     }
+ 
+ 
+     @Override
+     public FileUploader.FileUploaderBinder getFileUploaderBinder() {
+         return mUploaderBinder;
+     }
+ 
+     @Override
+     public OperationsService.OperationsServiceBinder getOperationsServiceBinder() {
+         return null;
+     }
+ 
+     @Override
+     public FileDataStorageManager getStorageManager() {
+         return null;
+     }
+ 
+     @Override
+     public FileOperationsHelper getFileOperationsHelper() {
+         return null;
+     }
+ 
+     protected ServiceConnection newTransferenceServiceConnection() {
+         return new PreferencesServiceConnection();
+     }
+ 
+     /** Defines callbacks for service binding, passed to bindService() */
+     private class PreferencesServiceConnection implements ServiceConnection {
+ 
+         @Override
+         public void onServiceConnected(ComponentName component, IBinder service) {
+ 
+             if (component.equals(new ComponentName(Preferences.this, FileDownloader.class))) {
+                 mDownloaderBinder = (FileDownloader.FileDownloaderBinder) service;
+ 
+             } else if (component.equals(new ComponentName(Preferences.this, FileUploader.class))) {
+                 Log_OC.d(TAG, "Upload service connected");
+                 mUploaderBinder = (FileUploader.FileUploaderBinder) service;
+             } else {
+                 return;
+             }
+ 
+         }
+ 
+         @Override
+         public void onServiceDisconnected(ComponentName component) {
+             if (component.equals(new ComponentName(Preferences.this, FileDownloader.class))) {
+                 Log_OC.d(TAG, "Download service suddenly disconnected");
+                 mDownloaderBinder = null;
+             } else if (component.equals(new ComponentName(Preferences.this, FileUploader.class))) {
+                 Log_OC.d(TAG, "Upload service suddenly disconnected");
+                 mUploaderBinder = null;
+             }
+         }
+     };
  }
diff --combined src/com/owncloud/android/ui/adapter/FileListListAdapter.java
index 15f6a8bb,2537d80f..fbdf69d8
--- a/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
+++ b/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
@@@ -1,6 -1,11 +1,11 @@@
- /* ownCloud Android client application
+ /**
+  *   ownCloud Android client application
+  *
+  *   @author Bartek Przybylski
+  *   @author Tobias Kaminsky
+  *   @author David A. Velasco
   *   Copyright (C) 2011  Bartek Przybylski
-  *   Copyright (C) 2012-2014 ownCloud Inc.
+  *   Copyright (C) 2015 ownCloud Inc.
   *
   *   This program is free software: you can redistribute it and/or modify
   *   it under the terms of the GNU General Public License version 2,
@@@ -19,11 -24,8 +24,8 @@@ package com.owncloud.android.ui.adapter
  
  
  import java.io.File;
- import java.util.Collections;
- import java.util.Comparator;
  import java.util.Vector;
  
- import third_parties.daveKoeller.AlphanumComparator;
  import android.accounts.Account;
  import android.content.Context;
  import android.content.SharedPreferences;
@@@ -33,11 -35,11 +35,12 @@@ import android.text.format.DateUtils
  import android.view.LayoutInflater;
  import android.view.View;
  import android.view.ViewGroup;
+ import android.widget.AbsListView;
  import android.widget.BaseAdapter;
+ import android.widget.GridView;
  import android.widget.ImageView;
 +import android.widget.LinearLayout;
  import android.widget.ListAdapter;
- import android.widget.ListView;
  import android.widget.TextView;
  
  import com.owncloud.android.R;
@@@ -45,9 -47,9 +48,9 @@@ import com.owncloud.android.authenticat
  import com.owncloud.android.datamodel.FileDataStorageManager;
  import com.owncloud.android.datamodel.OCFile;
  import com.owncloud.android.datamodel.ThumbnailsCacheManager;
- import com.owncloud.android.datamodel.ThumbnailsCacheManager.AsyncDrawable;
  import com.owncloud.android.files.services.FileDownloader.FileDownloaderBinder;
  import com.owncloud.android.files.services.FileUploader.FileUploaderBinder;
+ import com.owncloud.android.services.OperationsService.OperationsServiceBinder;
  import com.owncloud.android.ui.activity.ComponentsGetter;
  import com.owncloud.android.utils.DisplayUtils;
  import com.owncloud.android.utils.FileStorageUtils;
@@@ -56,52 -58,48 +59,47 @@@
  /**
   * This Adapter populates a ListView with all files and folders in an ownCloud
   * instance.
-  * 
-  * @author Bartek Przybylski
-  * @author Tobias Kaminsky
-  * @author David A. Velasco
   */
  public class FileListListAdapter extends BaseAdapter implements ListAdapter {
      private final static String PERMISSION_SHARED_WITH_ME = "S";
-     
+ 
      private Context mContext;
      private OCFile mFile = null;
      private Vector<OCFile> mFiles = null;
+     private Vector<OCFile> mFilesOrig = new Vector<OCFile>();
      private boolean mJustFolders;
  
      private FileDataStorageManager mStorageManager;
      private Account mAccount;
      private ComponentsGetter mTransferServiceGetter;
-     private Integer mSortOrder;
-     public static final Integer SORT_NAME = 0;
-     public static final Integer SORT_DATE = 1;
-     public static final Integer SORT_SIZE = 2;
-     private Boolean mSortAscending;
+     private boolean mGridMode;
+ 
+     private enum ViewType {LIST_ITEM, GRID_IMAGE, GRID_ITEM };
+ 
      private SharedPreferences mAppPreferences;
      
      public FileListListAdapter(
              boolean justFolders, 
-             Context context, 
+             Context context,
              ComponentsGetter transferServiceGetter
              ) {
- 
+         
          mJustFolders = justFolders;
          mContext = context;
          mAccount = AccountUtils.getCurrentOwnCloudAccount(mContext);
- 
          mTransferServiceGetter = transferServiceGetter;
-         
+ 
          mAppPreferences = PreferenceManager
                  .getDefaultSharedPreferences(mContext);
          
          // Read sorting order, default to sort by name ascending
-         mSortOrder = mAppPreferences
-                 .getInt("sortOrder", 0);
-         mSortAscending = mAppPreferences.getBoolean("sortAscending", true);
+         FileStorageUtils.mSortOrder = mAppPreferences.getInt("sortOrder", 0);
+         FileStorageUtils.mSortAscending = mAppPreferences.getBoolean("sortAscending", true);
 -
          
          // initialise thumbnails cache on background thread
          new ThumbnailsCacheManager.InitDiskCacheTask().execute();
  
+         mGridMode = false;
      }
      
      @Override
@@@ -140,146 -138,185 +138,190 @@@
  
      @Override
      public View getView(int position, View convertView, ViewGroup parent) {
+ 
          View view = convertView;
-         if (view == null) {
-             LayoutInflater inflator = (LayoutInflater) mContext
-                     .getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-             view = inflator.inflate(R.layout.list_item, null);
-         }
-          
+         OCFile file = null;
+         LayoutInflater inflator = (LayoutInflater) mContext
+                 .getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+ 
          if (mFiles != null && mFiles.size() > position) {
-             OCFile file = mFiles.get(position);
-             TextView fileName = (TextView) view.findViewById(R.id.Filename);           
+             file = mFiles.get(position);
+         }
+ 
+         // Find out which layout should be displayed
+         ViewType viewType;
+         if (!mGridMode){
+             viewType = ViewType.LIST_ITEM;
+         } else if (file.isImage()){
+             viewType = ViewType.GRID_IMAGE;
+         } else {
+             viewType = ViewType.GRID_ITEM;
+         }
+ 
+         // Create View
+         switch (viewType){
+             case GRID_IMAGE:
+                 view = inflator.inflate(R.layout.grid_image, null);
+                 break;
+             case GRID_ITEM:
+                 view = inflator.inflate(R.layout.grid_item, null);
+                 break;
+             case LIST_ITEM:
+                 view = inflator.inflate(R.layout.list_item, null);
+                 break;
+         }
+ 
+         view.invalidate();
+ 
+         if (file != null){
+ 
+             ImageView fileIcon = (ImageView) view.findViewById(R.id.thumbnail);
++
+             fileIcon.setTag(file.getFileId());
+             TextView fileName;
 -            String name;
 +            String name = file.getFileName();
 +
 +            LinearLayout linearLayout = (LinearLayout) view.findViewById(R.id.ListItemLayout);
 +            linearLayout.setContentDescription("LinearLayout-" + name);
  
-             fileName.setText(name);
-             ImageView fileIcon = (ImageView) view.findViewById(R.id.imageView1);
-             fileIcon.setTag(file.getFileId());
-             ImageView sharedIconV = (ImageView) view.findViewById(R.id.sharedIcon);
-             ImageView sharedWithMeIconV = (ImageView) view.findViewById(R.id.sharedWithMeIcon);
-             sharedWithMeIconV.setVisibility(View.GONE);
- 
-             ImageView localStateView = (ImageView) view.findViewById(R.id.imageView2);
-             localStateView.bringToFront();
-             FileDownloaderBinder downloaderBinder = 
-                     mTransferServiceGetter.getFileDownloaderBinder();
-             FileUploaderBinder uploaderBinder = mTransferServiceGetter.getFileUploaderBinder();
-             if (downloaderBinder != null && downloaderBinder.isDownloading(mAccount, file)) {
-                 localStateView.setImageResource(R.drawable.downloading_file_indicator);
-                 localStateView.setVisibility(View.VISIBLE);
-             } else if (uploaderBinder != null && uploaderBinder.isUploading(mAccount, file)) {
-                 localStateView.setImageResource(R.drawable.uploading_file_indicator);
-                 localStateView.setVisibility(View.VISIBLE);
-             } else if (file.isDown()) {
-                 localStateView.setImageResource(R.drawable.local_file_indicator);
-                 localStateView.setVisibility(View.VISIBLE);
-             } else {
-                 localStateView.setVisibility(View.INVISIBLE);
+             switch (viewType){
+                 case LIST_ITEM:
+                     TextView fileSizeV = (TextView) view.findViewById(R.id.file_size);
+                     TextView lastModV = (TextView) view.findViewById(R.id.last_mod);
+                     ImageView checkBoxV = (ImageView) view.findViewById(R.id.custom_checkbox);
+ 
+                     lastModV.setVisibility(View.VISIBLE);
+                     lastModV.setText(showRelativeTimestamp(file));
+ 
+                     checkBoxV.setVisibility(View.GONE);
+ 
+                     fileSizeV.setVisibility(View.VISIBLE);
+                     fileSizeV.setText(DisplayUtils.bytesToHumanReadable(file.getFileLength()));
+ 
+                     if (!file.isFolder()) {
+                         AbsListView parentList = (AbsListView)parent;
+                         if (parentList.getChoiceMode() == AbsListView.CHOICE_MODE_NONE) {
+                             checkBoxV.setVisibility(View.GONE);
+                         } else {
+                             if (parentList.isItemChecked(position)) {
+                                 checkBoxV.setImageResource(android.R.drawable.checkbox_on_background);
+                             } else {
+                                 checkBoxV.setImageResource(android.R.drawable.checkbox_off_background);
+                             }
+                             checkBoxV.setVisibility(View.VISIBLE);
+                         }
+ 
+                     } else { //Folder
+                         fileSizeV.setVisibility(View.INVISIBLE);
+                     }
+ 
+                 case GRID_ITEM:
+                     // filename
+                     fileName = (TextView) view.findViewById(R.id.Filename);
+                     name = file.getFileName();
+                     fileName.setText(name);
+ 
+                 case GRID_IMAGE:
+                     // sharedIcon
+                     ImageView sharedIconV = (ImageView) view.findViewById(R.id.sharedIcon);
+                     if (file.isShareByLink()) {
+                         sharedIconV.setVisibility(View.VISIBLE);
+                         sharedIconV.bringToFront();
+                     } else {
+                         sharedIconV.setVisibility(View.GONE);
+                     }
+ 
+                     // local state
+                     ImageView localStateView = (ImageView) view.findViewById(R.id.localFileIndicator);
+                     localStateView.bringToFront();
+                     FileDownloaderBinder downloaderBinder = mTransferServiceGetter.getFileDownloaderBinder();
+                     FileUploaderBinder uploaderBinder = mTransferServiceGetter.getFileUploaderBinder();
+                     boolean downloading = (downloaderBinder != null && downloaderBinder.isDownloading(mAccount, file));
+                     OperationsServiceBinder opsBinder = mTransferServiceGetter.getOperationsServiceBinder();
+                     downloading |= (opsBinder != null && opsBinder.isSynchronizing(mAccount, file.getRemotePath()));
+                     if (downloading) {
+                         localStateView.setImageResource(R.drawable.downloading_file_indicator);
+                         localStateView.setVisibility(View.VISIBLE);
+                     } else if (uploaderBinder != null && uploaderBinder.isUploading(mAccount, file)) {
+                         localStateView.setImageResource(R.drawable.uploading_file_indicator);
+                         localStateView.setVisibility(View.VISIBLE);
+                     } else if (file.isDown()) {
+                         localStateView.setImageResource(R.drawable.local_file_indicator);
+                         localStateView.setVisibility(View.VISIBLE);
+                     } else {
+                         localStateView.setVisibility(View.INVISIBLE);
+                     }
+ 
+                     // share with me icon
+                     if (!file.isFolder()) {
+                         ImageView sharedWithMeIconV = (ImageView) view.findViewById(R.id.sharedWithMeIcon);
+                         sharedWithMeIconV.bringToFront();
+                         if (checkIfFileIsSharedWithMe(file)) {
+                             sharedWithMeIconV.setVisibility(View.VISIBLE);
+                         } else {
+                             sharedWithMeIconV.setVisibility(View.GONE);
+                         }
+                     }
+ 
+                     break;
              }
              
-             TextView fileSizeV = (TextView) view.findViewById(R.id.file_size);
-             TextView lastModV = (TextView) view.findViewById(R.id.last_mod);
-             ImageView checkBoxV = (ImageView) view.findViewById(R.id.custom_checkbox);
+             // For all Views
              
+             // this if-else is needed even though favorite icon is visible by default
+             // because android reuses views in listview
+             if (!file.keepInSync()) {
+                 view.findViewById(R.id.favoriteIcon).setVisibility(View.GONE);
+             } else {
+                 view.findViewById(R.id.favoriteIcon).setVisibility(View.VISIBLE);
+             }
+             
+             // No Folder
              if (!file.isFolder()) {
-                 fileSizeV.setVisibility(View.VISIBLE);
-                 fileSizeV.setText(DisplayUtils.bytesToHumanReadable(file.getFileLength()));
-                 lastModV.setVisibility(View.VISIBLE);
-                 lastModV.setText(showRelativeTimestamp(file));
-                 // this if-else is needed even thoe fav icon is visible by default
-                 // because android reuses views in listview
-                 if (!file.keepInSync()) {
-                     view.findViewById(R.id.imageView3).setVisibility(View.GONE);
-                 } else {
-                     view.findViewById(R.id.imageView3).setVisibility(View.VISIBLE);
-                 }
-                 
-                 ListView parentList = (ListView)parent;
-                 if (parentList.getChoiceMode() == ListView.CHOICE_MODE_NONE) { 
-                     checkBoxV.setVisibility(View.GONE);
-                 } else {
-                     if (parentList.isItemChecked(position)) {
-                         checkBoxV.setImageResource(android.R.drawable.checkbox_on_background);
-                     } else {
-                         checkBoxV.setImageResource(android.R.drawable.checkbox_off_background);
-                     }
-                     checkBoxV.setVisibility(View.VISIBLE);
-                 }               
-                 
-                 // get Thumbnail if file is image
                  if (file.isImage() && file.getRemoteId() != null){
-                      // Thumbnail in Cache?
+                     // Thumbnail in Cache?
                      Bitmap thumbnail = ThumbnailsCacheManager.getBitmapFromDiskCache(
                              String.valueOf(file.getRemoteId())
-                     );
+                             );
                      if (thumbnail != null && !file.needsUpdateThumbnail()){
                          fileIcon.setImageBitmap(thumbnail);
                      } else {
                          // generate new Thumbnail
                          if (ThumbnailsCacheManager.cancelPotentialWork(file, fileIcon)) {
-                             final ThumbnailsCacheManager.ThumbnailGenerationTask task = 
+                             final ThumbnailsCacheManager.ThumbnailGenerationTask task =
                                      new ThumbnailsCacheManager.ThumbnailGenerationTask(
                                              fileIcon, mStorageManager, mAccount
-                                     );
+                                             );
                              if (thumbnail == null) {
                                  thumbnail = ThumbnailsCacheManager.mDefaultImg;
                              }
-                             final AsyncDrawable asyncDrawable = new AsyncDrawable(
+                             final ThumbnailsCacheManager.AsyncDrawable asyncDrawable =
+                                     new ThumbnailsCacheManager.AsyncDrawable(
                                      mContext.getResources(), 
                                      thumbnail, 
                                      task
-                             );
+                                     );
                              fileIcon.setImageDrawable(asyncDrawable);
                              task.execute(file);
                          }
                      }
                  } else {
-                     fileIcon.setImageResource(
-                             DisplayUtils.getResourceId(file.getMimetype(), file.getFileName())
-                     );
-                 }
- 
-                 if (checkIfFileIsSharedWithMe(file)) {
-                     sharedWithMeIconV.setVisibility(View.VISIBLE);
+                     fileIcon.setImageResource(DisplayUtils.getFileTypeIconId(file.getMimetype(), file.getFileName()));
                  }
-             } 
-             else {
-                   // TODO Re-enable when server supports folder-size calculation
- //                if (FileStorageUtils.getDefaultSavePathFor(mAccount.name, file) != null){
- //                    fileSizeV.setVisibility(View.VISIBLE);
- //                    fileSizeV.setText(getFolderSizeHuman(FileStorageUtils.getDefaultSavePathFor(mAccount.name, file)));
- //                } else {
-                     fileSizeV.setVisibility(View.INVISIBLE);
- //                }
- 
-                 lastModV.setVisibility(View.VISIBLE);
-                 lastModV.setText(showRelativeTimestamp(file));
-                 checkBoxV.setVisibility(View.GONE);
-                 view.findViewById(R.id.imageView3).setVisibility(View.GONE);
 +
+             } else {
+                 // Folder
                  if (checkIfFileIsSharedWithMe(file)) {
                      fileIcon.setImageResource(R.drawable.shared_with_me_folder);
-                     sharedWithMeIconV.setVisibility(View.VISIBLE);
+                 } else if (file.isShareByLink()) {
+                     // If folder is sharedByLink, icon folder must be changed to
+                     // folder-public one
+                     fileIcon.setImageResource(R.drawable.folder_public);
                  } else {
                      fileIcon.setImageResource(
-                             DisplayUtils.getResourceId(file.getMimetype(), file.getFileName())
+                             DisplayUtils.getFileTypeIconId(file.getMimetype(), file.getFileName())
                      );
                  }
- 
-                 // If folder is sharedByLink, icon folder must be changed to
-                 // folder-public one
-                 if (file.isShareByLink()) {
-                     fileIcon.setImageResource(R.drawable.folder_public);
-                 }
-             }
- 
-             if (file.isShareByLink()) {
-                 sharedIconV.setVisibility(View.VISIBLE);
-             } else {
-                 sharedIconV.setVisibility(View.GONE);
              }
          }
  
@@@ -298,7 -335,7 +340,7 @@@
          File dir = new File(path);
  
          if (dir.exists()) {
-             long bytes = getFolderSize(dir);
+             long bytes = FileStorageUtils.getFolderSize(dir);
              return DisplayUtils.bytesToHumanReadable(bytes);
          }
  
@@@ -356,6 -393,9 +398,9 @@@
          }
          if (mStorageManager != null) {
              mFiles = mStorageManager.getFolderContent(mFile);
+             mFilesOrig.clear();
+             mFilesOrig.addAll(mFiles);
+             
              if (mJustFolders) {
                  mFiles = getFolders(mFiles);
              }
@@@ -363,29 -403,11 +408,11 @@@
              mFiles = null;
          }
  
-         sortDirectory();
-     }
-     
-     /**
-      * Sorts all filenames, regarding last user decision 
-      */
-     private void sortDirectory(){
-         switch (mSortOrder){
-         case 0:
-             sortByName(mSortAscending);
-             break;
-         case 1:
-             sortByDate(mSortAscending);
-             break;
-         case 2: 
-             sortBySize(mSortAscending);
-             break;
-         }
-         
+         mFiles = FileStorageUtils.sortFolder(mFiles);
          notifyDataSetChanged();
      }
      
-     
+ 
      /**
       * Filter for getting only the folders
       * @param files
@@@ -418,110 -440,27 +445,27 @@@
                  && file.getPermissions().contains(PERMISSION_SHARED_WITH_ME));
      }
  
-     /**
-      * Sorts list by Date
-      * @param sortAscending true: ascending, false: descending
-      */
-     private void sortByDate(boolean sortAscending){
-         final Integer val;
-         if (sortAscending){
-             val = 1;
-         } else {
-             val = -1;
-         }
-         
-         Collections.sort(mFiles, new Comparator<OCFile>() {
-             public int compare(OCFile o1, OCFile o2) {
-                 if (o1.isFolder() && o2.isFolder()) {
-                     Long obj1 = o1.getModificationTimestamp();
-                     return val * obj1.compareTo(o2.getModificationTimestamp());
-                 }
-                 else if (o1.isFolder()) {
-                     return -1;
-                 } else if (o2.isFolder()) {
-                     return 1;
-                 } else if (o1.getModificationTimestamp() == 0 || o2.getModificationTimestamp() == 0){
-                     return 0;
-                 } else {
-                     Long obj1 = o1.getModificationTimestamp();
-                     return val * obj1.compareTo(o2.getModificationTimestamp());
-                 }
-             }
-         });
-     }
- 
-     /**
-      * Sorts list by Size
-      * @param sortAscending true: ascending, false: descending
-      */
-     private void sortBySize(boolean sortAscending){
-         final Integer val;
-         if (sortAscending){
-             val = 1;
-         } else {
-             val = -1;
-         }
-         
-         Collections.sort(mFiles, new Comparator<OCFile>() {
-             public int compare(OCFile o1, OCFile o2) {
-                 if (o1.isFolder() && o2.isFolder()) {
-                     Long obj1 = getFolderSize(new File(FileStorageUtils.getDefaultSavePathFor(mAccount.name, o1)));
-                     return val * obj1.compareTo(getFolderSize(new File(FileStorageUtils.getDefaultSavePathFor(mAccount.name, o2))));
-                 }
-                 else if (o1.isFolder()) {
-                     return -1;
-                 } else if (o2.isFolder()) {
-                     return 1;
-                 } else if (o1.getFileLength() == 0 || o2.getFileLength() == 0){
-                     return 0;
-                 } else {
-                     Long obj1 = o1.getFileLength();
-                     return val * obj1.compareTo(o2.getFileLength());
-                 }
-             }
-         });
-     }
- 
-     /**
-      * Sorts list by Name
-      * @param sortAscending true: ascending, false: descending
-      */
-     private void sortByName(boolean sortAscending){
-         final Integer val;
-         if (sortAscending){
-             val = 1;
-         } else {
-             val = -1;
-         }
- 
-         Collections.sort(mFiles, new Comparator<OCFile>() {
-             public int compare(OCFile o1, OCFile o2) {
-                 if (o1.isFolder() && o2.isFolder()) {
-                     return val * o1.getRemotePath().toLowerCase().compareTo(o2.getRemotePath().toLowerCase());
-                 } else if (o1.isFolder()) {
-                     return -1;
-                 } else if (o2.isFolder()) {
-                     return 1;
-                 }
-                 return val * new AlphanumComparator().compare(o1, o2);
-             }
-         });
-     }
- 
      public void setSortOrder(Integer order, boolean ascending) {
          SharedPreferences.Editor editor = mAppPreferences.edit();
          editor.putInt("sortOrder", order);
          editor.putBoolean("sortAscending", ascending);
          editor.commit();
          
-         mSortOrder = order;
-         mSortAscending = ascending;
+         FileStorageUtils.mSortOrder = order;
+         FileStorageUtils.mSortAscending = ascending;
          
-         sortDirectory();
-     }    
+ 
+         mFiles = FileStorageUtils.sortFolder(mFiles);
+         notifyDataSetChanged();
+ 
+     }
      
      private CharSequence showRelativeTimestamp(OCFile file){
          return DisplayUtils.getRelativeDateTimeString(mContext, file.getModificationTimestamp(),
                  DateUtils.SECOND_IN_MILLIS, DateUtils.WEEK_IN_MILLIS, 0);
      }
+ 
+     public void setGridMode(boolean gridMode) {
+         mGridMode = gridMode;
+     }
  }