Remove redundant code

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

src/main/java/com/owncloud/android/ui/activities/ActivitiesActivity.java

@@ -120,10 +120,7 @@ public class ActivitiesActivity extends FileActivity implements ActivityListInte
 
         // setup drawer
         setupDrawer(R.id.nav_activity);
-        ActionBar actionBar = getSupportActionBar();
-        if (actionBar != null) {
-            ThemeUtils.setColoredTitle(actionBar, getString(R.string.drawer_item_activities), this);
-        }
+        updateActionBarTitleAndHomeButtonByString(getString(R.string.drawer_item_activities));
 
         swipeListRefreshLayout.setOnRefreshListener(() -> {
             // We set lastGiven variable to undefined here since when manually refreshing

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

@@ -48,11 +48,11 @@ public class CommunityActivity extends FileActivity {
         // setup toolbar
         setupToolbar();
 
+        updateActionBarTitleAndHomeButtonByString(getString(R.string.drawer_community));
+
         // setup drawer
         setupDrawer(R.id.nav_community);
 
-        ThemeUtils.setColoredTitle(getSupportActionBar(), R.string.drawer_community, this);
-
         setupContent();
     }
 

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

@@ -268,20 +268,10 @@ public class FileDisplayActivity extends FileActivity
             openManageAccounts();
         });
 
-        // setup drawer
-        if (MainApp.isOnlyOnDevice()) {
-            setupDrawer(R.id.nav_on_device);
-        } else {
-            setupDrawer(R.id.nav_all_files);
-        }
-
         mDualPane = getResources().getBoolean(R.bool.large_land_layout);
         mLeftFragmentContainer = findViewById(R.id.left_fragment_container);
         mRightFragmentContainer = findViewById(R.id.right_fragment_container);
 
-        // Action bar setup
-        getSupportActionBar().setHomeButtonEnabled(true);
-
         // Init Fragment without UI to retain AsyncTask across configuration changes
         FragmentManager fm = getSupportFragmentManager();
         TaskRetainerFragment taskRetainerFragment =
@@ -2488,26 +2478,11 @@ public class FileDisplayActivity extends FileActivity
         return getListOfFilesFragment().isGridEnabled();
     }
 
-    public void allFilesOption() {
-        browseToRoot();
-    }
-
-    public void setActionBarTitle(@StringRes final int title) {
-        runOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                if (getSupportActionBar() != null) {
-                    ThemeUtils.setColoredTitle(getSupportActionBar(), title, getBaseContext());
-                }
-            }
-        });
-    }
-
     @Override
     public void showFiles(boolean onDeviceOnly) {
         super.showFiles(onDeviceOnly);
         if (onDeviceOnly) {
-            setActionBarTitle(R.string.drawer_item_on_device);
+            updateActionBarTitleAndHomeButtonByString(getString(R.string.drawer_item_on_device));
         }
         getListOfFilesFragment().refreshDirectory();
     }

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

@@ -147,10 +147,7 @@ public class FolderPickerActivity extends FileActivity implements FileFragment.C
             createFragments();
         }
 
-        if (getSupportActionBar() != null) {
-            getSupportActionBar().setDisplayShowTitleEnabled(true);
-            ThemeUtils.setColoredTitle(getSupportActionBar(), caption, this);
-        }
+        updateActionBarTitleAndHomeButtonByString(caption);
 
         // always AFTER setContentView(...) ; to work around bug in its implementation
 

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

@@ -53,8 +53,10 @@ public class ManageSpaceActivity extends AppCompatActivity implements Injectable
         setContentView(R.layout.activity_manage_space);
 
         ActionBar actionBar = getSupportActionBar();
-        actionBar.setDisplayHomeAsUpEnabled(true);
-        actionBar.setTitle(R.string.manage_space_title);
+        if (actionBar != null) {
+            actionBar.setDisplayHomeAsUpEnabled(true);
+            actionBar.setTitle(R.string.manage_space_title);
+        }
 
         TextView descriptionTextView = findViewById(R.id.general_description);
         descriptionTextView.setText(getString(R.string.manage_space_description, getString(R.string.app_name)));

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

@@ -138,6 +138,8 @@ public class NotificationsActivity extends FileActivity implements Notifications
         // setup toolbar
         setupToolbar();
 
+        updateActionBarTitleAndHomeButtonByString(getString(R.string.drawer_item_notifications));
+
         swipeEmptyListRefreshLayout = findViewById(R.id.swipe_containing_empty);
         swipeListRefreshLayout = findViewById(R.id.swipe_containing_list);
         ThemeUtils.colorSwipeRefreshLayout(this, swipeListRefreshLayout);
@@ -145,7 +147,6 @@ public class NotificationsActivity extends FileActivity implements Notifications
 
         // setup drawer
         setupDrawer(R.id.nav_notifications);
-        ThemeUtils.setColoredTitle(getSupportActionBar(), getString(R.string.drawer_item_notifications), this);
 
         if (!optionalUser.isPresent()) {
             // show error

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

@@ -177,9 +177,7 @@ public class SyncedFoldersActivity extends FileActivity implements SyncedFolderA
 
         // setup toolbar
         setupToolbar();
-        if (getSupportActionBar() != null){
-            getSupportActionBar().setTitle(R.string.drawer_synced_folders);
-        }
+        updateActionBarTitleAndHomeButtonByString(getString(R.string.drawer_synced_folders));
 
         // setup drawer
         setupDrawer(R.id.nav_synced_folders);
@@ -191,12 +189,6 @@ public class SyncedFoldersActivity extends FileActivity implements SyncedFolderA
 
         setupContent();
 
-        ActionBar actionBar = getSupportActionBar();
-        if (actionBar != null) {
-            ThemeUtils.setColoredTitle(getSupportActionBar(), getString(R.string.drawer_synced_folders), this);
-            actionBar.setDisplayHomeAsUpEnabled(true);
-        }
-
         if (ThemeUtils.themingEnabled(this)) {
             setTheme(R.style.FallbackThemingTheme);
         }

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

@@ -79,7 +79,6 @@ public abstract class ToolbarActivity extends BaseActivity {
      * to use the toolbar.
      */
     protected void setupToolbar(boolean isUserInfo, boolean isHomeSearchToolbarShow) {
-        int primaryColor = ThemeUtils.primaryAppbarColor(this);
         int fontColor = ThemeUtils.appBarPrimaryFontColor(this);
 
         Toolbar toolbar = findViewById(R.id.toolbar);

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

@@ -123,14 +123,12 @@ public class UploadListActivity extends FileActivity {
         // setup toolbar
         setupToolbar();
 
+        updateActionBarTitleAndHomeButtonByString(getString(R.string.uploads_view_title));
+
         // setup drawer
         setupDrawer(R.id.nav_uploads);
 
         setupContent();
-
-        if (getSupportActionBar() != null) {
-            ThemeUtils.setColoredTitle(getSupportActionBar(), R.string.uploads_view_title, this);
-        }
     }
 
     private void setupContent() {
@@ -200,7 +198,6 @@ public class UploadListActivity extends FileActivity {
     @Override
     protected void onStart() {
         super.onStart();
-        ThemeUtils.setColoredTitle(getSupportActionBar(), R.string.uploads_view_title, this);
         final Optional<User> optionalUser = getUser();
         if (optionalUser.isPresent()) {
             setAccountInDrawer(optionalUser.get());

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

@@ -113,8 +113,8 @@ public class TrashbinActivity extends FileActivity implements
         setContentView(R.layout.trashbin_activity);
         unbinder = ButterKnife.bind(this);
         setupToolbar();
+        updateActionBarTitleAndHomeButtonByString(getString(R.string.trashbin_activity_title));
         setupDrawer(R.id.nav_trashbin);
-        ThemeUtils.setColoredTitle(getSupportActionBar(), R.string.trashbin_activity_title, this);
     }
 
     @Override