fix file name in action bar

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

Author: alperozturk96

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

@@ -2564,7 +2564,7 @@ class FileDisplayActivity :
 
     fun configureToolbarForPreview(file: OCFile?) {
         lockScrolling()
-        super.updateActionBarTitleAndHomeButton(file)
+        updateActionBarForFile(file)
     }
 
     /**

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

@@ -46,6 +46,7 @@
 import javax.inject.Inject;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.annotation.StringRes;
 import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.widget.AppCompatSpinner;
@@ -205,27 +206,22 @@ public String getActionBarTitle(OCFile chosenFile, boolean isRoot) {
             return getActionBarRootTitle();
         }
 
-        if (chosenFile.isFolder()) {
-            return fileDataStorageManager.getFilenameConsideringOfflineOperation(chosenFile);
-        }
-
-        long parentId = chosenFile.getParentId();
-        OCFile parentFile = fileDataStorageManager.getFileById(parentId);
-        if (parentFile == null) {
-            return "";
-        }
+        return getActionBarTitleFromFile(chosenFile);
+    }
 
-        return fileDataStorageManager.getFilenameConsideringOfflineOperation(parentFile);
+    private String getActionBarTitleFromFile(OCFile file) {
+        // if offline rename operation already pointing same file, offline operation name will be used
+        return fileDataStorageManager.getFilenameConsideringOfflineOperation(file);
     }
 
-    protected void updateActionBarTitleAndHomeButton(OCFile chosenFile) {
+    protected void updateActionBarTitleAndHomeButton(OCFile file) {
         if (mAppBar == null) {
             return;
         }
 
         final OCFileDepth currentDirDepth = getCurrentDirDepth();
-        final boolean isRoot = isRoot(chosenFile) || currentDirDepth == OCFileDepth.Root;
-        final String title = getActionBarTitle(chosenFile, isRoot);
+        final boolean isRoot = isRoot(file) || currentDirDepth == OCFileDepth.Root;
+        final String title = getActionBarTitle(file, isRoot);
         updateActionBarTitleAndHomeButtonByString(title);
 
         final boolean isToolbarStyleSearch = DrawerActivity.isToolbarStyleSearch();
@@ -240,6 +236,20 @@ protected void updateActionBarTitleAndHomeButton(OCFile chosenFile) {
         }
     }
 
+    protected void updateActionBarForFile(@Nullable OCFile file) {
+        if (mAppBar == null || file == null) {
+            return;
+        }
+
+        final String title = getActionBarTitleFromFile(file);
+        updateActionBarTitleAndHomeButtonByString(title);
+
+        showHomeSearchToolbar(false);
+        final var actionBar = getSupportActionBar();
+        if (actionBar != null) {
+            viewThemeUtils.files.themeActionBar(this, actionBar, title, false);
+        }
+    }
 
     public void showSearchView() {
         if (isHomeSearchToolbarShow) {