From: Andy Scherzinger <info@andy-scherzinger.de>
Date: Fri, 6 Nov 2015 10:38:51 +0000 (+0100)
Subject: Merge branch 'master' of https://github.com/owncloud/android into material_buttons
X-Git-Tag: beta-20151128~7^2~2
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/c31f602fd19cac136032a3e02852f62be21aa489?ds=inline;hp=-c

Merge branch 'master' of https://github.com/owncloud/android into material_buttons

Conflicts:
	res/layout/list_item.xml
---

c31f602fd19cac136032a3e02852f62be21aa489
diff --combined res/layout/list_item.xml
index 71efa7d7,076ed7b7..cf09502e
--- a/res/layout/list_item.xml
+++ b/res/layout/list_item.xml
@@@ -22,7 -22,7 +22,7 @@@
      android:layout_width="match_parent"
      android:background="@drawable/list_selector"
      android:orientation="vertical"
 -    android:layout_height="56dp">
 +    android:layout_height="72dp">
  
      <LinearLayout
          android:layout_width="match_parent"
@@@ -30,12 -30,8 +30,12 @@@
          android:orientation="horizontal">
  
          <FrameLayout
 -            android:layout_width="56dp"
 -            android:layout_height="56dp"
 +            android:layout_width="60dp"
 +            android:layout_height="72dp"
 +            android:paddingLeft="12dp"
 +            android:paddingBottom="@dimen/standard_padding"
 +            android:paddingTop="@dimen/standard_padding"
 +            android:paddingRight="4dp"
              android:focusable="false"
              android:focusableInTouchMode="false">
  
@@@ -43,15 -39,16 +43,15 @@@
                  android:id="@+id/localFileIndicator"
                  android:layout_width="@dimen/file_icon_size"
                  android:layout_height="@dimen/file_icon_size"
 -                android:layout_gravity="center_vertical"
 -                android:layout_marginLeft="22dp"
 +                android:layout_gravity="top|right"
 +                android:layout_marginRight="4dp"
                  android:src="@drawable/local_file_indicator" />
  
              <ImageView
                  android:id="@+id/thumbnail"
                  android:layout_width="@dimen/file_icon_size"
                  android:layout_height="@dimen/file_icon_size"
 -                android:layout_gravity="center_vertical"
 -                android:layout_marginLeft="12dp"
 +                android:layout_gravity="left|center_vertical"
                  android:src="@drawable/ic_menu_archive" />
  
              <ImageView
@@@ -59,7 -56,8 +59,7 @@@
                  android:layout_width="wrap_content"
                  android:layout_height="wrap_content"
                  android:layout_gravity="bottom|right"
 -                android:layout_marginBottom="10dp"
 -                android:layout_marginRight="2dp"
 +                android:layout_marginRight="4dp"
                  android:src="@drawable/ic_favorite" />
          </FrameLayout>
  
@@@ -67,8 -65,7 +67,8 @@@
              android:layout_width="0dp"
              android:layout_height="match_parent"
              android:layout_weight="1"
 -            android:gravity="center_vertical"
 +            android:gravity="top"
 +            android:paddingTop="@dimen/standard_padding"
              android:orientation="vertical" >
  
              <TextView
@@@ -76,79 -73,54 +76,61 @@@
                  android:layout_width="wrap_content"
                  android:layout_height="wrap_content"
                  android:layout_gravity="center_vertical"
 -                android:layout_marginLeft="4dp"
 +                android:layout_marginLeft="0dp"
                  android:layout_marginRight="4dp"
                  android:ellipsize="middle"
                  android:singleLine="true"
                  android:text="TextView"
-                 android:textColor="#303030"
+                 android:textColor="@color/textColor"
 -                android:textSize="16dip" />
 +                android:textSize="@dimen/two_line_primary_text_size" />
  
              <LinearLayout
                  android:layout_width="match_parent"
                  android:layout_height="wrap_content"
 -                android:layout_marginLeft="4dp"
 +                android:layout_marginLeft="0dp"
                  android:layout_marginRight="4dp"
 -                android:weightSum="1">
 +                android:orientation="horizontal">
  
                  <TextView
 -                    android:id="@+id/last_mod"
 +                    android:id="@+id/file_size"
                      android:layout_width="wrap_content"
                      android:layout_height="wrap_content"
 -                    android:text="TextView"
 -                    android:layout_weight=".5"
 +                    android:text="Size MB"
                      android:textColor="@color/list_item_lastmod_and_filesize_text"
 -                    android:textSize="12dip"/>
 +                    android:textSize="@dimen/two_line_secondary_text_size"/>
  
                  <TextView
 -                    android:id="@+id/file_size"
 +                    android:id="@+id/file_separator"
                      android:layout_width="wrap_content"
                      android:layout_height="wrap_content"
                      android:gravity="right"
 -                    android:text="TextView"
 +                    android:text=", "
                      android:textColor="@color/list_item_lastmod_and_filesize_text"
 -                    android:layout_weight=".5"
 -                    android:textSize="12dip"/>
 +                    android:textSize="@dimen/two_line_secondary_text_size"/>
 +
 +                <TextView
 +                    android:id="@+id/last_mod"
 +                    android:layout_width="wrap_content"
 +                    android:layout_height="wrap_content"
 +                    android:gravity="right"
 +                    android:text="Mod Date"
 +                    android:textColor="@color/list_item_lastmod_and_filesize_text"
 +                    android:textSize="@dimen/two_line_secondary_text_size"/>
  
              </LinearLayout>
  
          </LinearLayout>
  
-         <LinearLayout
-             android:layout_width="25dp"
-             android:layout_height="match_parent"
-             android:gravity="center_vertical"
-             android:orientation="vertical">
- 
-             <ImageView
-                 android:id="@+id/sharedIcon"
-                 android:layout_width="wrap_content"
-                 android:layout_height="wrap_content"
-                 android:layout_gravity="center"
-                 android:layout_marginLeft="4dp"
-                 android:layout_marginBottom="4dp"
-                 android:layout_marginRight="4dp"
-                 android:src="@drawable/sharedlink" />
- 
-             <ImageView
-                 android:id="@+id/sharedWithMeIcon"
-                 android:layout_width="wrap_content"
-                 android:layout_height="wrap_content"
-                 android:layout_gravity="center"
-                 android:layout_marginLeft="4dp"
-                 android:layout_marginRight="4dp"
-                 android:layout_marginTop="4dp"
-                 android:src="@drawable/shared_with_me"
-                 android:visibility="invisible" />
- 
-         </LinearLayout>
+         <ImageView
+             android:id="@+id/sharedIcon"
+             android:layout_width="wrap_content"
+             android:layout_height="wrap_content"
+             android:layout_gravity="center"
+             android:layout_marginTop="4dp"
+             android:layout_marginLeft="4dp"
+             android:layout_marginBottom="4dp"
+             android:layout_marginRight="4dp"
+             android:src="@drawable/shared_via_link" />
  
          <ImageView
              android:id="@+id/custom_checkbox"
@@@ -156,9 -128,9 +138,9 @@@
              android:layout_height="wrap_content"
              android:layout_gravity="center_vertical"
              android:layout_marginLeft="4dp"
 -            android:layout_marginRight="4dp"
 +            android:layout_marginRight="@dimen/standard_margin"
              android:gravity=""
 -            android:src="@android:drawable/checkbox_off_background" />
 +            android:src="@drawable/ic_checkbox_blank_outline" />
      </LinearLayout>
  
      <View
diff --combined res/layout/ssl_untrusted_cert_layout.xml
index 9e195b5c,2f359f8e..8b6d502b
--- a/res/layout/ssl_untrusted_cert_layout.xml
+++ b/res/layout/ssl_untrusted_cert_layout.xml
@@@ -21,7 -21,7 +21,7 @@@
      android:layout_width="wrap_content"
      android:layout_height="wrap_content"
      android:gravity="center"
 -	android:padding="16dp"
 +	android:padding="@dimen/standard_padding"
      android:orientation="vertical" >
  
  	<TextView
@@@ -29,7 -29,7 +29,7 @@@
  		android:layout_width="wrap_content"
  		android:layout_height="wrap_content"
  		android:layout_weight="0"
 -		android:paddingBottom="16dp"
 +		android:paddingBottom="@dimen/standard_padding"
  		android:text="@string/ssl_validator_header"
  		android:textAppearance="?android:attr/textAppearanceMedium"
  		android:textColor="@android:color/black"
@@@ -377,7 -377,6 +377,6 @@@
  				    android:text=""
  				    android:textAppearance="?android:attr/textAppearanceSmall"
  				/>
- 				
  
  				<TextView
          			android:id="@+id/label_signature"
@@@ -404,16 -403,24 +403,24 @@@
          			android:text=""
          			android:textAppearance="?android:attr/textAppearanceSmall"
          		/>
- 																								
- 								
+ 
  				<TextView
-         			android:id="@+id/value_signature"
-         			android:layout_width="wrap_content"
-         			android:layout_height="wrap_content"
+ 					android:id="@+id/label_certificate_fingerprint"
+ 					android:layout_width="wrap_content"
+ 					android:layout_height="wrap_content"
  					android:paddingBottom="5dp"
-         			android:text=""
-         			android:textAppearance="?android:attr/textAppearanceSmall"
-         		/>
+ 					android:text="@string/ssl_validator_label_certificate_fingerprint"
+ 					android:textAppearance="?android:attr/textAppearanceSmall"
+ 				/>
+ 
+ 				<TextView
+ 					android:id="@+id/value_certificate_fingerprint"
+ 					android:layout_width="wrap_content"
+ 					android:layout_height="wrap_content"
+ 					android:paddingBottom="5dp"
+ 					android:text=""
+ 					android:textAppearance="?android:attr/textAppearanceSmall"
+ 				/>
  				
  		</LinearLayout>
  		
@@@ -424,7 -431,7 +431,7 @@@
          android:layout_width="wrap_content"
          android:layout_height="wrap_content"
  		android:layout_weight="0"
 -		android:paddingTop="16dp"
 +		android:paddingTop="@dimen/standard_padding"
          android:text="@string/ssl_validator_question"
          android:textAppearance="?android:attr/textAppearanceMedium"
          >
diff --combined res/values/styles.xml
index 7df7639e,b7a64843..4c072507
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@@ -24,15 -24,20 +24,15 @@@
  	<style name="Theme.ownCloud" parent="Theme.AppCompat.Light.DarkActionBar">
      	<item name="android:actionBarStyle">@style/Theme.ownCloud.Widget.ActionBar</item>
      	<item name="actionBarStyle">@style/Theme.ownCloud.Widget.ActionBar</item>
 -    	<item name="android:buttonStyle">@style/Theme.ownCloud.ButtonStyle</item>
  		<item name="colorPrimary">@color/primary</item>
  		<item name="colorPrimaryDark">@color/primary_dark</item>
  		<item name="colorAccent">@color/color_accent</item>
  		<item name="android:alertDialogTheme">@style/Theme.ownCloud.Dialog</item>
  		<item name="alertDialogTheme">@style/ownCloud.AlertDialog</item>
 -		<item name="colorButtonNormal">@color/background_color</item>
 -		<item name="colorControlActivated">@color/primary_dark</item>
 -		<item name="colorControlHighlight">@color/color_accent</item>
  	</style>
  
  	<!-- seperate action bar style for activities without an action bar -->
  	<style name="Theme.ownCloud.noActionBar" parent="Theme.AppCompat.Light.DarkActionBar">
 -		<item name="android:buttonStyle">@style/Theme.ownCloud.ButtonStyle</item>
  		<item name="windowNoTitle">true</item>
  		<item name="windowActionBar">false</item>
  		<item name="colorPrimary">@color/primary</item>
@@@ -40,6 -45,9 +40,6 @@@
  		<item name="colorAccent">@color/color_accent</item>
  		<item name="android:alertDialogTheme">@style/Theme.ownCloud.Dialog</item>
  		<item name="alertDialogTheme">@style/ownCloud.AlertDialog</item>
 -		<item name="colorButtonNormal">@color/background_color</item>
 -		<item name="colorControlActivated">@color/primary_dark</item>
 -		<item name="colorControlHighlight">@color/color_accent</item>
      </style>
  
  	<style name="Theme.ownCloud.noActionBar.Login" parent="Theme.ownCloud.noActionBar">
@@@ -216,4 -224,10 +216,10 @@@
  		
  	<color name="setup_text_hint">#777777</color>
  	<color name="setup_text_typed">#000000</color>
+     <style name="Theme.ownCloud.NoActionBar">
+         <item name="windowActionBar">false</item>
+         <item name="windowNoTitle">true</item>
+     </style>
+     <style name="Theme.ownCloud.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
+     <style name="Theme.ownCloud.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />
  </resources>
diff --combined src/com/owncloud/android/ui/activity/FileActivity.java
index 3edd40c9,249ae8df..7dc13b9b
--- a/src/com/owncloud/android/ui/activity/FileActivity.java
+++ b/src/com/owncloud/android/ui/activity/FileActivity.java
@@@ -43,7 -43,6 +43,6 @@@ import android.support.v4.widget.Drawer
  import android.support.v7.app.ActionBar;
  import android.support.v7.app.ActionBarDrawerToggle;
  import android.support.v7.app.AppCompatActivity;
- import android.util.Log;
  import android.view.View;
  import android.widget.AdapterView;
  import android.widget.ListView;
@@@ -68,10 -67,12 +67,12 @@@ import com.owncloud.android.lib.common.
  import com.owncloud.android.lib.common.operations.RemoteOperationResult;
  import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode;
  import com.owncloud.android.lib.common.utils.Log_OC;
- import com.owncloud.android.operations.CreateShareOperation;
+ import com.owncloud.android.operations.CreateShareViaLinkOperation;
+ import com.owncloud.android.operations.CreateShareWithShareeOperation;
+ import com.owncloud.android.operations.GetSharesForFileOperation;
  import com.owncloud.android.operations.SynchronizeFileOperation;
  import com.owncloud.android.operations.SynchronizeFolderOperation;
- import com.owncloud.android.operations.UnshareLinkOperation;
+ import com.owncloud.android.operations.UnshareOperation;
  import com.owncloud.android.services.OperationsService;
  import com.owncloud.android.services.OperationsService.OperationsServiceBinder;
  import com.owncloud.android.ui.NavigationDrawerItem;
@@@ -100,12 -101,13 +101,13 @@@ public class FileActivity extends AppCo
      public static final String TAG = FileActivity.class.getSimpleName();
  
      private static final String DIALOG_WAIT_TAG = "DIALOG_WAIT";
+ 
      private static final String KEY_WAITING_FOR_OP_ID = "WAITING_FOR_OP_ID";
      private static final String DIALOG_SHARE_PASSWORD = "DIALOG_SHARE_PASSWORD";
      private static final String KEY_TRY_SHARE_AGAIN = "TRY_SHARE_AGAIN";
      private static final String KEY_ACTION_BAR_TITLE = "ACTION_BAR_TITLE";
  
-     protected static final long DELAY_TO_REQUEST_OPERATION_ON_ACTIVITY_RESULTS = 200;
+     protected static final long DELAY_TO_REQUEST_OPERATIONS_LATER = 200;
  
  
      /** OwnCloud {@link Account} where the main {@link OCFile} handled by the activity is located.*/
@@@ -182,7 -184,9 +184,9 @@@
                      savedInstanceState.getLong(KEY_WAITING_FOR_OP_ID, Long.MAX_VALUE)
                      );
              mTryShareAgain = savedInstanceState.getBoolean(KEY_TRY_SHARE_AGAIN);
-             getSupportActionBar().setTitle(savedInstanceState.getString(KEY_ACTION_BAR_TITLE));
+             if (getSupportActionBar() != null) {
+                 getSupportActionBar().setTitle(savedInstanceState.getString(KEY_ACTION_BAR_TITLE));
+             }
          } else {
              account = getIntent().getParcelableExtra(FileActivity.EXTRA_ACCOUNT);
              mFile = getIntent().getParcelableExtra(FileActivity.EXTRA_FILE);
@@@ -363,7 -367,12 +367,7 @@@
  //        }
  
          // Display username in drawer
 -        Account account = AccountUtils.getCurrentOwnCloudAccount(getApplicationContext());
 -        if (account != null) {
 -            TextView username = (TextView) navigationDrawerLayout.findViewById(R.id.drawer_username);
 -            int lastAtPos = account.name.lastIndexOf("@");
 -            username.setText(account.name.substring(0, lastAtPos));
 -        }
 +        setUsernameInDrawer(navigationDrawerLayout, AccountUtils.getCurrentOwnCloudAccount(getApplicationContext()));
  
          // load slide menu items
          mDrawerTitles = getResources().getStringArray(R.array.drawer_items);
@@@ -430,21 -439,6 +434,21 @@@
      }
  
      /**
 +     * sets the given account name in the drawer in case the drawer is available. The account name
 +     * is shortened beginning from the @-sign in the username.
 +     *
 +     * @param navigationDrawerLayout the drawer layout to be used
 +     * @param account                the account to be set in the drawer
 +     */
 +    protected void setUsernameInDrawer(RelativeLayout navigationDrawerLayout, Account account) {
 +        if (navigationDrawerLayout != null && getAccount() != null) {
 +            TextView username = (TextView) navigationDrawerLayout.findViewById(R.id.drawer_username);
 +            int lastAtPos = account.name.lastIndexOf("@");
 +            username.setText(account.name.substring(0, lastAtPos));
 +        }
 +    }
 +
 +    /**
       * Updates title bar and home buttons (state and icon).
       *
       * Assumes that navigation drawer is NOT visible.
@@@ -561,7 -555,7 +565,7 @@@
          outState.putBoolean(FileActivity.EXTRA_FROM_NOTIFICATION, mFromNotification);
          outState.putLong(KEY_WAITING_FOR_OP_ID, mFileOperationsHelper.getOpIdWaitingFor());
          outState.putBoolean(KEY_TRY_SHARE_AGAIN, mTryShareAgain);
-         if(getSupportActionBar().getTitle() != null) {
+         if(getSupportActionBar() != null && getSupportActionBar().getTitle() != null) {
              // Null check in case the actionbar is used in ActionBar.NAVIGATION_MODE_LIST
              // since it doesn't have a title then
              outState.putString(KEY_ACTION_BAR_TITLE, getSupportActionBar().getTitle().toString());
@@@ -719,6 -713,8 +723,8 @@@
  
          mFileOperationsHelper.setOpIdWaitingFor(Long.MAX_VALUE);
  
+         dismissLoadingDialog();
+ 
          if (!result.isSuccess() && (
                  result.getCode() == ResultCode.UNAUTHORIZED ||
                  result.isIdPRedirection() ||
@@@ -736,18 -732,37 +742,37 @@@
              }
              mTryShareAgain = false;
  
-         } else if (operation instanceof CreateShareOperation) {
-             onCreateShareOperationFinish((CreateShareOperation) operation, result);
+         } else if (operation == null ||
+                 operation instanceof CreateShareWithShareeOperation ||
+                 operation instanceof UnshareOperation ||
+                 operation instanceof SynchronizeFolderOperation
+                 ) {
+             if (result.isSuccess()) {
+                 updateFileFromDB();
  
-         } else if (operation instanceof UnshareLinkOperation) {
-             onUnshareLinkOperationFinish((UnshareLinkOperation)operation, result);
+             } else if (result.getCode() != ResultCode.CANCELLED) {
+                 Toast t = Toast.makeText(this,
+                         ErrorMessageAdapter.getErrorCauseMessage(result, operation, getResources()),
+                         Toast.LENGTH_LONG);
+                 t.show();
+             }
+ 
+         } else if (operation instanceof CreateShareViaLinkOperation) {
+             onCreateShareViaLinkOperationFinish((CreateShareViaLinkOperation) operation, result);
  
-         } else if (operation instanceof SynchronizeFolderOperation) {
-             onSynchronizeFolderOperationFinish((SynchronizeFolderOperation)operation, result);
+         } else if (operation instanceof SynchronizeFileOperation) {
+             onSynchronizeFileOperationFinish((SynchronizeFileOperation) operation, result);
  
-         }else if (operation instanceof SynchronizeFileOperation) {
-             onSynchronizeFileOperationFinish((SynchronizeFileOperation)operation, result);
+         } else if (operation instanceof GetSharesForFileOperation) {
+             if (result.isSuccess()) {
+                 updateFileFromDB();
  
+             } else if (result.getCode() != ResultCode.SHARE_NOT_FOUND) {
+                 Toast t = Toast.makeText(this,
+                         ErrorMessageAdapter.getErrorCauseMessage(result, operation, getResources()),
+                         Toast.LENGTH_LONG);
+                 t.show();
+             }
          }
      }
  
@@@ -763,14 -778,13 +788,13 @@@
  
  
  
-     private void onCreateShareOperationFinish(CreateShareOperation operation,
-                                               RemoteOperationResult result) {
-         dismissLoadingDialog();
+     private void onCreateShareViaLinkOperationFinish(CreateShareViaLinkOperation operation,
+                                                      RemoteOperationResult result) {
          if (result.isSuccess()) {
              mTryShareAgain = false;
              updateFileFromDB();
  
-             Intent sendIntent = operation.getSendIntent();
+             Intent sendIntent = operation.getSendIntentWithSubject(this);
              startActivity(sendIntent);
          } else {
              // Detect Failure (403) --> needs Password
@@@ -796,34 -810,8 +820,8 @@@
          }
      }
  
- 
-     private void onUnshareLinkOperationFinish(UnshareLinkOperation operation,
-                                               RemoteOperationResult result) {
-         dismissLoadingDialog();
- 
-         if (result.isSuccess()){
-             updateFileFromDB();
- 
-         } else {
-             Toast t = Toast.makeText(this, ErrorMessageAdapter.getErrorCauseMessage(result,
-                             operation, getResources()), Toast.LENGTH_LONG);
-             t.show();
-         }
-     }
- 
-     private void onSynchronizeFolderOperationFinish(
-             SynchronizeFolderOperation operation, RemoteOperationResult result
-     ) {
-         if (!result.isSuccess() && result.getCode() != ResultCode.CANCELLED){
-             Toast t = Toast.makeText(this, ErrorMessageAdapter.getErrorCauseMessage(result,
-                             operation, getResources()), Toast.LENGTH_LONG);
-             t.show();
-         }
-     }
- 
      private void onSynchronizeFileOperationFinish(SynchronizeFileOperation operation,
                                                    RemoteOperationResult result) {
-         dismissLoadingDialog();
          OCFile syncedFile = operation.getLocalFile();
          if (!result.isSuccess()) {
              if (result.getCode() == ResultCode.SYNC_CONFLICT) {
@@@ -855,9 -843,9 +853,9 @@@
      /**
       * Show loading dialog
       */
-     public void showLoadingDialog() {
+     public void showLoadingDialog(String message) {
          // Construct dialog
-         LoadingDialog loading = new LoadingDialog(getResources().getString(R.string.wait_a_moment));
+         LoadingDialog loading = new LoadingDialog(message);
          FragmentManager fm = getSupportFragmentManager();
          FragmentTransaction ft = fm.beginTransaction();
          loading.show(ft, DIALOG_WAIT_TAG);
diff --combined src/com/owncloud/android/ui/activity/FileDisplayActivity.java
index 3ade4dfc,e814c2d3..89d22c6b
--- a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
+++ b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
@@@ -79,13 -79,14 +79,14 @@@ import com.owncloud.android.lib.common.
  import com.owncloud.android.lib.common.utils.Log_OC;
  import com.owncloud.android.operations.CopyFileOperation;
  import com.owncloud.android.operations.CreateFolderOperation;
- import com.owncloud.android.operations.CreateShareOperation;
+ import com.owncloud.android.operations.CreateShareViaLinkOperation;
+ import com.owncloud.android.operations.CreateShareWithShareeOperation;
  import com.owncloud.android.operations.MoveFileOperation;
  import com.owncloud.android.operations.RefreshFolderOperation;
  import com.owncloud.android.operations.RemoveFileOperation;
  import com.owncloud.android.operations.RenameFileOperation;
  import com.owncloud.android.operations.SynchronizeFileOperation;
- import com.owncloud.android.operations.UnshareLinkOperation;
+ import com.owncloud.android.operations.UnshareOperation;
  import com.owncloud.android.services.observer.FileObserverService;
  import com.owncloud.android.syncadapter.FileSyncAdapter;
  import com.owncloud.android.ui.dialog.ConfirmationDialogFragment;
@@@ -116,8 -117,6 +117,6 @@@ public class FileDisplayActivity extend
          implements FileFragment.ContainerActivity,
          OnSslUntrustedCertListener, OnEnforceableRefreshListener {
  
- 
- 
      private SyncBroadcastReceiver mSyncBroadcastReceiver;
      private UploadFinishReceiver mUploadFinishReceiver;
      private DownloadFinishReceiver mDownloadFinishReceiver;
@@@ -227,6 -226,13 +226,13 @@@
      }
  
      @Override
+     protected void onStop() {
+         Log_OC.v(TAG, "onStop() start");
+         super.onStop();
+         Log_OC.v(TAG, "onStop() end");
+     }
+ 
+     @Override
      protected void onDestroy() {
          Log_OC.v(TAG, "onDestroy() start");
          super.onDestroy();
@@@ -265,7 -271,12 +271,7 @@@
              setFile(file);
  
              if (mAccountWasSet) {
 -                RelativeLayout navigationDrawerLayout = (RelativeLayout) findViewById(R.id.left_drawer);
 -                if (navigationDrawerLayout != null && getAccount() != null) {
 -                    TextView username = (TextView) navigationDrawerLayout.findViewById(R.id.drawer_username);
 -                    int lastAtPos = getAccount().name.lastIndexOf("@");
 -                    username.setText(getAccount().name.substring(0, lastAtPos));
 -                }
 +                setUsernameInDrawer((RelativeLayout) findViewById(R.id.left_drawer), getAccount());
              }
  
              if (!stateWasRecovered) {
@@@ -631,7 -642,7 +637,7 @@@
                              requestMoveOperation(fData, fResultCode);
                          }
                      },
-                     DELAY_TO_REQUEST_OPERATION_ON_ACTIVITY_RESULTS
+                     DELAY_TO_REQUEST_OPERATIONS_LATER
              );
  
          } else if (requestCode == ACTION_COPY_FILES && resultCode == RESULT_OK) {
@@@ -645,7 -656,7 +651,7 @@@
                              requestCopyOperation(fData, fResultCode);
                          }
                      },
-                     DELAY_TO_REQUEST_OPERATION_ON_ACTIVITY_RESULTS
+                     DELAY_TO_REQUEST_OPERATIONS_LATER
              );
  
          } else {
@@@ -978,6 -989,7 +984,7 @@@
                              }
  
                          }
+ 
                      }
                      removeStickyBroadcast(intent);
                      Log_OC.d(TAG, "Setting progress visibility to " + mSyncInProgress);
@@@ -1341,11 -1353,14 +1348,14 @@@
          } else if (operation instanceof CreateFolderOperation) {
              onCreateFolderOperationFinish((CreateFolderOperation) operation, result);
  
-         } else if (operation instanceof CreateShareOperation) {
-             onCreateShareOperationFinish((CreateShareOperation) operation, result);
+         } else if (operation instanceof CreateShareViaLinkOperation ||
+                     operation instanceof CreateShareWithShareeOperation ) {
  
-         } else if (operation instanceof UnshareLinkOperation) {
-             onUnshareLinkOperationFinish((UnshareLinkOperation) operation, result);
+             refreshShowDetails();
+             refreshListOfFilesFragment();
+ 
+         } else if (operation instanceof UnshareOperation) {
+             onUnshareLinkOperationFinish((UnshareOperation) operation, result);
  
          } else if (operation instanceof MoveFileOperation) {
              onMoveFileOperationFinish((MoveFileOperation) operation, result);
@@@ -1355,15 -1370,8 +1365,8 @@@
          }
  
      }
-     private void onCreateShareOperationFinish(CreateShareOperation operation,
-                                               RemoteOperationResult result) {
-         if (result.isSuccess()) {
-             refreshShowDetails();
-             refreshListOfFilesFragment();
-         }
-     }
  
-     private void onUnshareLinkOperationFinish(UnshareLinkOperation operation,
+     private void onUnshareLinkOperationFinish(UnshareOperation operation,
                                                RemoteOperationResult result) {
          if (result.isSuccess()) {
              refreshShowDetails();
@@@ -1404,8 -1412,6 +1407,6 @@@
       */
      private void onRemoveFileOperationFinish(RemoveFileOperation operation,
                                               RemoteOperationResult result) {
-         dismissLoadingDialog();
- 
          Toast msg = Toast.makeText(this,
                  ErrorMessageAdapter.getErrorCauseMessage(result, operation, getResources()),
                  Toast.LENGTH_LONG);
@@@ -1444,10 -1450,8 +1445,8 @@@
      private void onMoveFileOperationFinish(MoveFileOperation operation,
                                             RemoteOperationResult result) {
          if (result.isSuccess()) {
-             dismissLoadingDialog();
              refreshListOfFilesFragment();
          } else {
-             dismissLoadingDialog();
              try {
                  Toast msg = Toast.makeText(FileDisplayActivity.this,
                          ErrorMessageAdapter.getErrorCauseMessage(result, operation, getResources()),
@@@ -1469,10 -1473,8 +1468,8 @@@
       */
      private void onCopyFileOperationFinish(CopyFileOperation operation, RemoteOperationResult result) {
          if (result.isSuccess()) {
-             dismissLoadingDialog();
              refreshListOfFilesFragment();
          } else {
-             dismissLoadingDialog();
              try {
                  Toast msg = Toast.makeText(FileDisplayActivity.this,
                          ErrorMessageAdapter.getErrorCauseMessage(result, operation, getResources()),
@@@ -1494,7 -1496,6 +1491,6 @@@
       */
      private void onRenameFileOperationFinish(RenameFileOperation operation,
                                               RemoteOperationResult result) {
-         dismissLoadingDialog();
          OCFile renamedFile = operation.getFile();
          if (result.isSuccess()) {
              FileFragment details = getSecondFragment();
@@@ -1563,10 -1564,8 +1559,8 @@@
      private void onCreateFolderOperationFinish(CreateFolderOperation operation,
                                                 RemoteOperationResult result) {
          if (result.isSuccess()) {
-             dismissLoadingDialog();
              refreshListOfFilesFragment();
          } else {
-             dismissLoadingDialog();
              try {
                  Toast msg = Toast.makeText(FileDisplayActivity.this,
                          ErrorMessageAdapter.getErrorCauseMessage(result, operation, getResources()),
@@@ -1629,26 -1628,60 +1623,60 @@@
          return null;
      }
  
-     public void startSyncFolderOperation(OCFile folder, boolean ignoreETag) {
-         long currentSyncTime = System.currentTimeMillis();
- 
-         mSyncInProgress = true;
- 
-         // perform folder synchronization
-         RemoteOperation synchFolderOp = new RefreshFolderOperation( folder,
-                 currentSyncTime,
-                 false,
-                 getFileOperationsHelper().isSharedSupported(),
-                 ignoreETag,
-                 getStorageManager(),
-                 getAccount(),
-                 getApplicationContext()
+     /**
+      * Starts an operation to refresh the requested folder.
+      *
+      * The operation is run in a new background thread created on the fly.
+      *
+      * The refresh updates is a "light sync": properties of regular files in folder are updated (including
+      * associated shares), but not their contents. Only the contents of files marked to be kept-in-sync are
+      * synchronized too.
+      *
+      * @param folder        Folder to refresh.
+      * @param ignoreETag    If 'true', the data from the server will be fetched and sync'ed even if the eTag
+      *                      didn't change.
+      */
+     public void startSyncFolderOperation(final OCFile folder, final boolean ignoreETag) {
+ 
+         // the execution is slightly delayed to allow the activity get the window focus if it's being started
+         // or if the method is called from a dialog that is being dismissed
+         getHandler().postDelayed(
+                 new Runnable() {
+                     @Override
+                     public void run() {
+                         if (hasWindowFocus()) {
+                             long currentSyncTime = System.currentTimeMillis();
+                             mSyncInProgress = true;
+ 
+                             // perform folder synchronization
+                             RemoteOperation synchFolderOp = new RefreshFolderOperation(folder,
+                                     currentSyncTime,
+                                     false,
+                                     getFileOperationsHelper().isSharedSupported(),
+                                     ignoreETag,
+                                     getStorageManager(),
+                                     getAccount(),
+                                     getApplicationContext()
+                             );
+                             synchFolderOp.execute(
+                                     getAccount(),
+                                     MainApp.getAppContext(),
+                                     FileDisplayActivity.this,
+                                     null,
+                                     null
+                             );
+ 
+                             mProgressBar.setIndeterminate(true);
+ 
+                             setBackgroundText();
+ 
+                         }   // else: NOTHING ; lets' not refresh when the user rotates the device but there is
+                         // another window floating over
+                     }
+                 },
+                 DELAY_TO_REQUEST_OPERATIONS_LATER
          );
-         synchFolderOp.execute(getAccount(), MainApp.getAppContext(), this, null, null);
- 
-         mProgressBar.setIndeterminate(true);
  
-         setBackgroundText();
      }
  
      /**
diff --combined src/com/owncloud/android/ui/adapter/FileListListAdapter.java
index a41e4fe5,07a3eed5..3c362f39
--- a/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
+++ b/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
@@@ -63,7 -63,6 +63,6 @@@ import com.owncloud.android.utils.Mimet
   * instance.
   */
  public class FileListListAdapter extends BaseAdapter implements ListAdapter {
-     private final static String PERMISSION_SHARED_WITH_ME = "S";
  
      private Context mContext;
      private OCFile mFile = null;
@@@ -194,7 -193,6 +193,7 @@@
              switch (viewType){
                  case LIST_ITEM:
                      TextView fileSizeV = (TextView) view.findViewById(R.id.file_size);
 +                    TextView fileSizeSeparatorV = (TextView) view.findViewById(R.id.file_separator);
                      TextView lastModV = (TextView) view.findViewById(R.id.last_mod);
                      ImageView checkBoxV = (ImageView) view.findViewById(R.id.custom_checkbox);
  
@@@ -203,7 -201,6 +202,7 @@@
  
                      checkBoxV.setVisibility(View.GONE);
  
 +                    fileSizeSeparatorV.setVisibility(View.VISIBLE);
                      fileSizeV.setVisibility(View.VISIBLE);
                      fileSizeV.setText(DisplayUtils.bytesToHumanReadable(file.getFileLength()));
  
@@@ -215,18 -212,17 +214,18 @@@
                              } else {
                                  if (parentList.isItemChecked(position)) {
                                      checkBoxV.setImageResource(
 -                                            android.R.drawable.checkbox_on_background);
 +                                            R.drawable.ic_checkbox_marked);
                                  } else {
                                      checkBoxV.setImageResource(
 -                                            android.R.drawable.checkbox_off_background);
 +                                            R.drawable.ic_checkbox_blank_outline);
                                  }
                                  checkBoxV.setVisibility(View.VISIBLE);
                              }
                          }
  
                      } else { //Folder
 -                        fileSizeV.setVisibility(View.INVISIBLE);
 +                        fileSizeSeparatorV.setVisibility(View.GONE);
 +                        fileSizeV.setVisibility(View.GONE);
                      }
  
                  case GRID_ITEM:
@@@ -238,13 -234,21 +237,21 @@@
                  case GRID_IMAGE:
                      // sharedIcon
                      ImageView sharedIconV = (ImageView) view.findViewById(R.id.sharedIcon);
-                     if (file.isShareByLink()) {
+                     if (file.isSharedViaLink()) {
+                         sharedIconV.setImageResource(R.drawable.shared_via_link);
+                         sharedIconV.setVisibility(View.VISIBLE);
+                         sharedIconV.bringToFront();
+                     } else if (file.isSharedWithSharee() || file.isSharedWithMe() ) {
+                         sharedIconV.setImageResource(R.drawable.shared_via_users);
                          sharedIconV.setVisibility(View.VISIBLE);
                          sharedIconV.bringToFront();
                      } else {
                          sharedIconV.setVisibility(View.GONE);
                      }
  
+                     /*ImageView sharedWithMeIcon = (ImageView) view.findViewById(R.id.sharedWithMeIcon);
+                     sharedWithMeIcon.bringToFront();*/
+ 
                      // local state
                      ImageView localStateView = (ImageView) view.findViewById(R.id.localFileIndicator);
                      localStateView.bringToFront();
@@@ -295,17 -299,6 +302,6 @@@
                          localStateView.setVisibility(View.VISIBLE);
                      }
  
-                     // share with me icon
-                     ImageView sharedWithMeIconV = (ImageView)
-                             view.findViewById(R.id.sharedWithMeIcon);
-                     sharedWithMeIconV.bringToFront();
-                     if (checkIfFileIsSharedWithMe(file) &&
-                             (!file.isFolder() || !mGridMode)) {
-                         sharedWithMeIconV.setVisibility(View.VISIBLE);
-                     } else {
-                         sharedWithMeIconV.setVisibility(View.GONE);
-                     }
- 
                      break;
              }
              
@@@ -364,7 -357,10 +360,10 @@@
                  // Folder
                  fileIcon.setImageResource(
                          MimetypeIconUtil.getFolderTypeIconId(
-                                 checkIfFileIsSharedWithMe(file), file.isShareByLink()));
+                                 file.isSharedWithMe() || file.isSharedWithSharee(),
+                                 file.isSharedViaLink()
+                         )
+                 );
              }
          }
  
@@@ -436,20 -432,6 +435,6 @@@
      }
      
      
-     /**
-      * Check if parent folder does not include 'S' permission and if file/folder
-      * is shared with me
-      * 
-      * @param file: OCFile
-      * @return boolean: True if it is shared with me and false if it is not
-      */
-     private boolean checkIfFileIsSharedWithMe(OCFile file) {
-         return (mFile.getPermissions() != null 
-                 && !mFile.getPermissions().contains(PERMISSION_SHARED_WITH_ME)
-                 && file.getPermissions() != null 
-                 && file.getPermissions().contains(PERMISSION_SHARED_WITH_ME));
-     }
- 
      public void setSortOrder(Integer order, boolean ascending) {
          SharedPreferences.Editor editor = mAppPreferences.edit();
          editor.putInt("sortOrder", order);
diff --combined src/com/owncloud/android/ui/adapter/LocalFileListAdapter.java
index a6839e55,a339ed74..fa963fd2
--- a/src/com/owncloud/android/ui/adapter/LocalFileListAdapter.java
+++ b/src/com/owncloud/android/ui/adapter/LocalFileListAdapter.java
@@@ -121,11 -121,9 +121,11 @@@ public class LocalFileListAdapter exten
              fileIcon.setTag(file.hashCode());
  
              TextView fileSizeV = (TextView) view.findViewById(R.id.file_size);
 +            TextView fileSizeSeparatorV = (TextView) view.findViewById(R.id.file_separator);
              TextView lastModV = (TextView) view.findViewById(R.id.last_mod);
              ImageView checkBoxV = (ImageView) view.findViewById(R.id.custom_checkbox);
              if (!file.isDirectory()) {
 +                fileSizeSeparatorV.setVisibility(View.VISIBLE);
                  fileSizeV.setVisibility(View.VISIBLE);
                  fileSizeV.setText(DisplayUtils.bytesToHumanReadable(file.length()));
  
@@@ -136,9 -134,9 +136,9 @@@
                      checkBoxV.setVisibility(View.GONE);
                  } else {
                      if (parentList.isItemChecked(position)) {
 -                        checkBoxV.setImageResource(android.R.drawable.checkbox_on_background);
 +                        checkBoxV.setImageResource(R.drawable.ic_checkbox_marked);
                      } else {
 -                        checkBoxV.setImageResource(android.R.drawable.checkbox_off_background);
 +                        checkBoxV.setImageResource(R.drawable.ic_checkbox_blank_outline);
                      }
                      checkBoxV.setVisibility(View.VISIBLE);
                  }
@@@ -177,7 -175,6 +177,7 @@@
                  }  
  
              } else {
 +                fileSizeSeparatorV.setVisibility(View.GONE);
                  fileSizeV.setVisibility(View.GONE);
                  lastModV.setVisibility(View.GONE);
                  checkBoxV.setVisibility(View.GONE);
@@@ -188,7 -185,6 +188,6 @@@
              view.findViewById(R.id.favoriteIcon).setVisibility(View.GONE);
              
              view.findViewById(R.id.sharedIcon).setVisibility(View.GONE);
-             view.findViewById(R.id.sharedWithMeIcon).setVisibility(View.GONE);
          }
  
          return view;