use error screen for connection problems

for other use snackbar

src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java

@@ -336,6 +336,7 @@ public abstract class DrawerActivity extends ToolbarActivity implements DisplayU
         }
 
         Account account = AccountUtils.getCurrentOwnCloudAccount(this);
+        OwnCloudVersion ownCloudVersion = AccountUtils.getServerVersion(getAccount());
         boolean searchSupported = AccountUtils.hasSearchSupport(account);
 
         if (getResources().getBoolean(R.bool.bottom_toolbar_enabled) && account != null) {
@@ -354,7 +355,9 @@ public abstract class DrawerActivity extends ToolbarActivity implements DisplayU
         if (getAccount() != null) {
             FileDataStorageManager storageManager = new FileDataStorageManager(getAccount(), getContentResolver());
             OCCapability capability = storageManager.getCapability(getAccount().name);
-            if (capability.getFilesUndelete().isFalse() || capability.getFilesUndelete().isUnknown()) {
+            
+            if (ownCloudVersion.compareTo(OwnCloudVersion.nextcloud_14) < 0 && 
+                    (capability.getFilesUndelete().isFalse() || capability.getFilesUndelete().isUnknown())) {
                 navigationView.getMenu().removeItem(R.id.nav_trashbin);
             }
         }

src/main/java/com/owncloud/android/ui/trashbin/TrashbinActivity.java

@@ -267,14 +267,22 @@ public class TrashbinActivity extends FileActivity implements TrashbinActivityIn
     }
 
     @Override
-    public void showError(int message) {
+    public void showSnackbarError(int message, TrashbinFile file) {
         swipeListRefreshLayout.setRefreshing(false);
-        Snackbar.make(recyclerView, getString(message), Snackbar.LENGTH_LONG).show();
+        Snackbar.make(recyclerView, String.format(getString(message), file.getFileName()), Snackbar.LENGTH_LONG).show();
     }
 
     @Override
-    public void showError(int message, TrashbinFile file) {
+    public void showError(int message) {
         swipeListRefreshLayout.setRefreshing(false);
-        Snackbar.make(recyclerView, String.format(getString(message), file.getFileName()), Snackbar.LENGTH_LONG).show();
+        
+        if (emptyContentMessage != null) {
+            emptyContentHeadline.setText(R.string.common_error);
+            emptyContentIcon.setImageDrawable(getResources().getDrawable(R.drawable.ic_list_empty_error));
+            emptyContentMessage.setText(message);
+
+            emptyContentMessage.setVisibility(View.VISIBLE);
+            emptyContentIcon.setVisibility(View.VISIBLE);
+        }
     }
 }

src/main/java/com/owncloud/android/ui/trashbin/TrashbinContract.java

@@ -32,7 +32,7 @@ public interface TrashbinContract {
     interface View {
         void showTrashbinFolder(List<Object> trashbinFiles);
 
-        void showError(int message, TrashbinFile file);
+        void showSnackbarError(int message, TrashbinFile file);
 
         void showError(int message);
 

src/main/java/com/owncloud/android/ui/trashbin/TrashbinPresenter.java

@@ -85,7 +85,7 @@ public class TrashbinPresenter implements TrashbinContract.Presenter {
             if (success) {
                 trashbinView.removeFile(file);
             } else {
-                trashbinView.showError(R.string.trashbin_file_not_restored, file);
+                trashbinView.showSnackbarError(R.string.trashbin_file_not_restored, file);
             }
         });
     }
@@ -96,7 +96,7 @@ public class TrashbinPresenter implements TrashbinContract.Presenter {
             if (success) {
                 trashbinView.removeFile(file);
             } else {
-                trashbinView.showError(R.string.trashbin_file_not_deleted, file);
+                trashbinView.showSnackbarError(R.string.trashbin_file_not_deleted, file);
             }
         });
     }