mirror of
https://github.com/nextcloud/android.git
synced 2024-11-28 02:17:43 +03:00
use current account
wrong nc14 check
This commit is contained in:
parent
256bd6baa2
commit
56ab910e41
1 changed files with 5 additions and 5 deletions
|
@ -352,12 +352,12 @@ public abstract class DrawerActivity extends ToolbarActivity implements DisplayU
|
||||||
navigationView.getMenu().removeItem(R.id.nav_videos);
|
navigationView.getMenu().removeItem(R.id.nav_videos);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (getAccount() != null) {
|
if (account != null) {
|
||||||
FileDataStorageManager storageManager = new FileDataStorageManager(getAccount(), getContentResolver());
|
FileDataStorageManager storageManager = new FileDataStorageManager(account, getContentResolver());
|
||||||
OCCapability capability = storageManager.getCapability(getAccount().name);
|
OCCapability capability = storageManager.getCapability(account.name);
|
||||||
|
|
||||||
if (ownCloudVersion.compareTo(OwnCloudVersion.nextcloud_14) < 0 &&
|
if (ownCloudVersion.compareTo(OwnCloudVersion.nextcloud_14) < 0 ||
|
||||||
(capability.getFilesUndelete().isFalse() || capability.getFilesUndelete().isUnknown())) {
|
capability.getFilesUndelete().isFalse() || capability.getFilesUndelete().isUnknown()) {
|
||||||
navigationView.getMenu().removeItem(R.id.nav_trashbin);
|
navigationView.getMenu().removeItem(R.id.nav_trashbin);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue