From: Andy Scherzinger <info@andy-scherzinger.de>
Date: Mon, 7 Sep 2015 09:13:04 +0000 (+0200)
Subject: Merge branch 'master' of https://github.com/owncloud/android into material_fab
X-Git-Tag: beta-20151202~3^2~59
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/d039bffbd171b95c6db2eff4b39c42fc731ca895?hp=--cc

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

d039bffbd171b95c6db2eff4b39c42fc731ca895
diff --cc src/com/owncloud/android/ui/activity/FileDisplayActivity.java
index 1576a605,20bcdce4..85711d78
--- a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
+++ b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
@@@ -492,9 -506,12 +501,10 @@@ public class FileDisplayActivity extend
          boolean retval = true;
          switch (item.getItemId()) {
              case R.id.action_create_dir: {
 -                CreateFolderDialogFragment dialog =
 -                        CreateFolderDialogFragment.newInstance(getCurrentDir());
 -                dialog.show(getSupportFragmentManager(), DIALOG_CREATE_FOLDER);
 +                createFolder();
                  break;
              }
+ 
              case R.id.action_sync_account: {
                  startSynchronization();
                  break;