From: Andy Scherzinger <info@andy-scherzinger.de>
Date: Fri, 16 Oct 2015 08:41:32 +0000 (+0200)
Subject: Merge branch 'master' of https://github.com/owncloud/android into material_buttons
X-Git-Tag: beta-20151128~7^2~15
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/30720e98a53c5a664631635c8799762b377bb915?hp=-c

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

30720e98a53c5a664631635c8799762b377bb915
diff --combined src/com/owncloud/android/ui/activity/FileDisplayActivity.java
index fa1dd798,240d146f..f5026459
--- a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
+++ b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
@@@ -265,7 -265,12 +265,7 @@@ public class FileDisplayActivity extend
              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) {
@@@ -1536,6 -1541,7 +1536,7 @@@
                  OCFile syncedFile = operation.getLocalFile();
                  onTransferStateChanged(syncedFile, true, true);
                  invalidateOptionsMenu();
+                 refreshShowDetails();
              }
          }
      }