remove duplicated calls

Signed-off-by: alperozturk <[email protected]>

Author: alperozturk96

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

@@ -533,7 +533,7 @@ class FileDisplayActivity :
         }
 
         /** reset views */
-        resetTitleBarAndScrolling()
+        resetScrollingAndUpdateActionBar()
     }
 
     // region Handle Intents
@@ -632,6 +632,8 @@ class FileDisplayActivity :
                 }
             }
         }
+
+        listOfFilesFragment?.setCurrentSearchType(searchEvent)
     }
     // endregion
 
@@ -789,8 +791,8 @@ class FileDisplayActivity :
             return null
         }
 
-    protected fun resetTitleBarAndScrolling() {
-        updateActionBarTitleAndHomeButton(null)
+    protected fun resetScrollingAndUpdateActionBar(searchType: SearchType = SearchType.NO_SEARCH) {
+        updateActionBarTitleAndHomeButton(file, searchType)
         resetScrolling(true)
     }
 
@@ -1233,7 +1235,7 @@ class FileDisplayActivity :
             listOfFiles.registerFabListener()
         }
 
-        resetTitleBarAndScrolling()
+        resetScrollingAndUpdateActionBar(listOfFilesFragment?.currentSearchType ?: SearchType.NO_SEARCH)
         configureMenuItem()
         startMetadataSyncForCurrentDir()
     }
@@ -1519,7 +1521,7 @@ class FileDisplayActivity :
 
     private fun handleRemovedFileFromServer(currentFile: OCFile?, currentDir: OCFile?): OCFile? {
         if (currentFile == null && file?.isFolder == false) {
-            resetTitleBarAndScrolling()
+            resetScrollingAndUpdateActionBar()
             return currentDir
         }
 
@@ -1797,12 +1799,12 @@ class FileDisplayActivity :
             startSyncFolderOperation(root, false)
         }
         binding.fabMain.setImageResource(R.drawable.ic_plus)
-        resetTitleBarAndScrolling()
+        resetScrollingAndUpdateActionBar(listOfFilesFragment?.currentSearchType ?: SearchType.NO_SEARCH)
     }
 
     override fun onBrowsedDownTo(directory: OCFile?) {
         file = directory
-        resetTitleBarAndScrolling()
+        resetScrollingAndUpdateActionBar()
         startSyncFolderOperation(directory, false)
         startMetadataSyncForCurrentDir()
     }
@@ -2099,7 +2101,7 @@ class FileDisplayActivity :
             val fileAvailable = storageManager.fileExists(removedFile.fileId)
             if (leftFragment is FileFragment && !fileAvailable && removedFile == leftFragment.file) {
                 file = storageManager.getFileById(removedFile.parentId)
-                resetTitleBarAndScrolling()
+                resetScrollingAndUpdateActionBar()
             }
             val parentFile = storageManager.getFileById(removedFile.parentId)
             if (parentFile != null && parentFile == getCurrentDir()) {
@@ -2305,7 +2307,7 @@ class FileDisplayActivity :
                 leftFragment.updateFileDetails(file, currentUser)
             } else {
                 if (!file.fileExists()) {
-                    resetTitleBarAndScrolling()
+                    resetScrollingAndUpdateActionBar()
                 } else {
                     leftFragment.updateFileDetails(false, true)
                 }
@@ -2735,7 +2737,8 @@ class FileDisplayActivity :
         }
 
         listOfFilesFragment?.setCurrentSearchType(event)
-        listOfFilesFragment?.setActionBarTitle()
+        updateActionBarTitleAndHomeButton(null)
+        //listOfFilesFragment?.setActionBarTitle()
     }
 
     @Subscribe(threadMode = ThreadMode.MAIN)

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

@@ -155,12 +155,14 @@ public void setupHomeSearchToolbarWithSortAndListButtons() {
     }
 
     public void updateActionBarTitleAndHomeButton(OCFile chosenFile, SearchType searchType) {
+        if (mAppBar == null) {
+            return;
+        }
+
         boolean isRoot = isRoot(chosenFile);
         String title = getActionBarTitle(chosenFile, searchType);
         updateActionBarTitleAndHomeButtonByString(title);
-        if (mAppBar != null) {
-            showHomeSearchToolbar(title, isRoot);
-        }
+        showHomeSearchToolbar(title, isRoot);
     }
 
     protected void updateActionBarTitleAndHomeButton(OCFile chosenFile) {

app/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java

@@ -290,7 +290,6 @@ public void onAttach(@NonNull Context context) {
         Log_OC.i(TAG, "onAttach");
         try {
             mContainerActivity = (FileFragment.ContainerActivity) context;
-            setActionBarTitle();
         } catch (ClassCastException e) {
             throw new IllegalArgumentException(context.toString() + " must implement " +
                                                    FileFragment.ContainerActivity.class.getSimpleName(), e);
@@ -434,10 +433,8 @@ public void onActivityCreated(Bundle savedInstanceState) {
             });
         }
 
-        setActionBarTitle();
-
-        if (getActivity() instanceof FileDisplayActivity fileDisplayActivity) {
-            fileDisplayActivity.updateActionBarTitleAndHomeButton(fileDisplayActivity.getCurrentDir(), currentSearchType);
+        if (getActivity() instanceof FileDisplayActivity fda) {
+            fda.updateActionBarTitleAndHomeButton(fda.getCurrentDir(), currentSearchType);
         }
         listDirectory(MainApp.isOnlyOnDevice(), false);
     }
@@ -1062,7 +1059,6 @@ public int onBrowseUp() {
             Pair<Integer, OCFile> result = futureResult.get();
             mFile = result.second;
             setFileDepth(mFile);
-            setActionBarTitle();
             updateFileList();
             return result.first;
         } catch (Exception e) {
@@ -1810,28 +1806,18 @@ protected void setEmptyView(SearchEvent event) {
     @Subscribe(threadMode = ThreadMode.MAIN)
     public void onMessageEvent(ChangeMenuEvent changeMenuEvent) {
         resetSearchAttributes();
-
         resetMenuItems();
-        Activity activity = getActivity();
-        if (activity != null) {
-            activity.invalidateOptionsMenu();
-
-            if (activity instanceof FileDisplayActivity) {
-                ((FileDisplayActivity) activity).initSyncBroadcastReceiver();
-            }
-
-            setActionBarTitle(themeUtils.getDefaultDisplayNameForRootFolder(getContext()), false);
-            activity.getIntent().removeExtra(OCFileListFragment.SEARCH_EVENT);
-        }
 
-        Bundle arguments = getArguments();
-        if (arguments != null) {
-            arguments.putParcelable(OCFileListFragment.SEARCH_EVENT, null);
+        if (getActivity() instanceof FileDisplayActivity fda) {
+            fda.invalidateOptionsMenu();
+            fda.getIntent().removeExtra(OCFileListFragment.SEARCH_EVENT);
+            fda.updateActionBarTitleAndHomeButton(null, NO_SEARCH);
         }
 
         if (mFile != null) {
             setFabVisible(mFile.canCreateFileAndFolder());
         }
+
         slideHideBottomBehaviourForBottomNavigationView(true);
     }
 
@@ -2088,31 +2074,6 @@ public void onMessageEvent(FileLockEvent event) {
         }
     }
 
-    public void setActionBarTitle() {
-        if (!(getActivity() instanceof FileDisplayActivity fda) || currentSearchType == null) {
-            return;
-        }
-
-        String title = fda.getActionBarTitle(mFile, currentSearchType);
-        boolean isRoot = (getFileDepth() == OCFileDepth.Root) || fda.isRoot(mFile);
-        setActionBarTitle(title, isRoot);
-    }
-
-    protected void setActionBarTitle(final String title, Boolean showBackAsMenu) {
-        if (!(getActivity() instanceof FileDisplayActivity fda)) {
-            return;
-        }
-
-        final var actionBar = fda.getSupportActionBar();
-        if (actionBar == null) {
-            return;
-        }
-
-        fda.runOnUiThread(() -> {
-            viewThemeUtils.files.themeActionBar(fda, actionBar, title, showBackAsMenu);
-        });
-    }
-
     @Override
     public void onStart() {
         super.onStart();