X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/3c78d4fcfbde357bf39f452b3442684e3c34f204..dde5e5575cd7358ebed3390ca384e78bf9e3d17b:/src/com/owncloud/android/ui/activity/FileActivity.java diff --git a/src/com/owncloud/android/ui/activity/FileActivity.java b/src/com/owncloud/android/ui/activity/FileActivity.java index 4d55e6bb..14a65f5d 100644 --- a/src/com/owncloud/android/ui/activity/FileActivity.java +++ b/src/com/owncloud/android/ui/activity/FileActivity.java @@ -411,13 +411,6 @@ public class FileActivity extends AppCompatActivity invalidateOptionsMenu(); } }; - - mDrawerToggle.setToolbarNavigationClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - Log.i("IT WORKS :)",""); - } - }); // Set the list's click listener mDrawerList.setOnItemClickListener(new DrawerItemClickListener()); @@ -813,14 +806,15 @@ public class FileActivity extends AppCompatActivity i.putExtra(ConflictsResolveActivity.EXTRA_FILE, syncedFile); i.putExtra(ConflictsResolveActivity.EXTRA_ACCOUNT, getAccount()); startActivity(i); - } + } else { if (!operation.transferWasRequested()) { Toast msg = Toast.makeText(this, ErrorMessageAdapter.getErrorCauseMessage(result, operation, getResources()), Toast.LENGTH_LONG); msg.show(); } + invalidateOptionsMenu(); } }