Browse Source

Fix a few issues

Mario Danic 8 years ago
parent
commit
6fdb67b593

+ 1 - 1
build.gradle

@@ -173,7 +173,7 @@ dependencies {
     compile name: 'touch-image-view'
     compile 'com.android.support:multidex:1.0.1'
 
-    compile 'com.github.nextcloud:android-library:toggle-favourite-SNAPSHOT'
+    compile 'com.github.nextcloud:android-library:master-SNAPSHOT'
     compile "com.android.support:support-v4:${supportLibraryVersion}"
     compile "com.android.support:design:${supportLibraryVersion}"
     compile 'com.jakewharton:disklrucache:2.0.2'

+ 1 - 1
src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java

@@ -306,10 +306,10 @@ public abstract class DrawerActivity extends ToolbarActivity implements DisplayU
             if (getResources().getBoolean(R.bool.bottom_toolbar_enabled)) {
                 navigationView.getMenu().removeItem(R.id.nav_all_files);
                 navigationView.getMenu().removeItem(R.id.nav_settings);
+                navigationView.getMenu().removeItem(R.id.nav_favorites);
             }
             if (!searchSupported) {
                 navigationView.getMenu().removeItem(R.id.nav_videos);
-                navigationView.getMenu().removeItem(R.id.nav_favorites);
             }
         }
 

+ 1 - 4
src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java

@@ -203,10 +203,7 @@ public class OCFileListFragment extends ExtendedListFragment implements OCFileLi
             currentSearchType = SearchType.NO_SEARCH;
         }
 
-        boolean searchSupported = AccountUtils.hasSearchSupport(AccountUtils.
-                getCurrentOwnCloudAccount(MainApp.getAppContext()));
-
-        if (getResources().getBoolean(R.bool.bottom_toolbar_enabled) && searchSupported) {
+        if (getResources().getBoolean(R.bool.bottom_toolbar_enabled)) {
             bottomNavigationView.setVisibility(View.VISIBLE);
             prepareBottomNavigationView();
         }