Refactor

Signed-off-by: Joris Bodin <joris.bodin@infomaniak.com>

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

@@ -158,7 +158,11 @@ public abstract class FileActivity extends DrawerActivity
     public void showFiles(boolean onDeviceOnly) {
         // must be specialized in subclasses
         MainApp.showOnlyFilesOnDevice(onDeviceOnly);
-        setupToolbar(!onDeviceOnly);
+        if (onDeviceOnly) {
+            setupToolbar();
+        } else {
+            setupHomeSearchToolbar();
+        }
     }
 
     /**

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

@@ -258,7 +258,7 @@ public class FileDisplayActivity extends FileActivity
         setContentView(R.layout.files);
 
         // setup toolbar
-        setupToolbar(true);
+        setupHomeSearchToolbar();
 
         mMenuButton.setOnClickListener(v -> {
             openDrawer();
@@ -1251,16 +1251,16 @@ public class FileDisplayActivity extends FileActivity
         if (menuItemId == -1) {
             if (MainApp.isOnlyOnDevice()) {
                 setDrawerMenuItemChecked(R.id.nav_on_device);
-                setupToolbar(false);
+                setupToolbar();
             } else {
                 setDrawerMenuItemChecked(R.id.nav_all_files);
-                setupToolbar(true);
+                setupHomeSearchToolbar();
             }
         } else {
             if (menuItemId == R.id.nav_all_files) {
-                setupToolbar(true);
+                setupHomeSearchToolbar();
             } else {
-                setupToolbar(false);
+                setupToolbar();
             }
             setDrawerMenuItemChecked(menuItemId);
         }

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

@@ -76,7 +76,7 @@ public abstract class ToolbarActivity extends BaseActivity {
      * Toolbar setup that must be called in implementer's {@link #onCreate} after {@link #setContentView} if they want
      * to use the toolbar.
      */
-    protected void setupToolbar(boolean isHomeSearchToolbarShow) {
+    private void setupToolbar(boolean isHomeSearchToolbarShow) {
         int fontColor = ThemeUtils.appBarPrimaryFontColor(this);
 
         Toolbar toolbar = findViewById(R.id.toolbar);
@@ -112,6 +112,10 @@ public abstract class ToolbarActivity extends BaseActivity {
         setupToolbar(false);
     }
 
+    public void setupHomeSearchToolbar() {
+        setupToolbar(true);
+    }
+
     /**
      * Updates title bar and home buttons (state and icon).
      */

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

@@ -142,7 +142,7 @@ public class UserInfoActivity extends FileActivity implements Injectable {
         setContentView(R.layout.user_info_layout);
         unbinder = ButterKnife.bind(this);
 
-        setupToolbar(false);
+        setupToolbar();
 
         // set the back button from action bar
         ActionBar actionBar = getSupportActionBar();