fixed title on search while sharing thorugh extension (#115)

Alfresco · May 27, 2022 · 19409fc · 19409fc
1 parent 04d802e
commit 19409fc
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/app/src/main/res/navigation/nav_bottom.xml b/app/src/main/res/navigation/nav_bottom.xml
@@ -78,7 +78,7 @@
             android:name="moveId"
             app:argType="string" />
 
-        <deepLink app:uri="alfresco://content/search/folder/{id}/{extension}/{moveId}?title={title}" />
+        <deepLink app:uri="alfresco://content/search/folder/{id}/{extension}?title={title}" />
     </fragment>
 
     <fragment

diff --git a/app/src/main/res/navigation/nav_share_extension.xml b/app/src/main/res/navigation/nav_share_extension.xml
@@ -78,7 +78,7 @@
             android:name="moveId"
             app:argType="string" />
 
-        <deepLink app:uri="alfresco://content/search/folder/{id}/{extension}/{moveId}?title={title}" />
+        <deepLink app:uri="alfresco://content/search/folder/{id}/{extension}?title={title}" />
     </fragment>
 
 </navigation>
diff --git a/common/src/main/kotlin/com/alfresco/content/NavControllerExt.kt b/common/src/main/kotlin/com/alfresco/content/NavControllerExt.kt
@@ -60,8 +60,11 @@ private fun NavController.navigateFolderLink(entry: Entry) =
 /**
  * navigate to contextual search
  */
-fun NavController.navigateToContextualSearch(id: String, title: String, isExtension: Boolean, moveId: String = "") =
-    navigate(Uri.parse("$BASE_URI/search/folder/$id/$isExtension/$moveId?title=${Uri.encode(title)}"))
+fun NavController.navigateToContextualSearch(id: String, title: String, isExtension: Boolean, moveId: String = "") {
+    if (moveId.isNotEmpty())
+        navigate(Uri.parse("$BASE_URI/search/folder/$id/$isExtension/$moveId?title=${Uri.encode(title)}"))
+    else navigate(Uri.parse("$BASE_URI/search/folder/$id/$isExtension?title=${Uri.encode(title)}"))
+}
 
 /**
  * navigate to browse parent folder

diff --git a/search/src/main/kotlin/com/alfresco/content/search/SearchResultsFragment.kt b/search/src/main/kotlin/com/alfresco/content/search/SearchResultsFragment.kt
@@ -15,6 +15,7 @@ import com.alfresco.content.data.SearchFacetData
 import com.alfresco.content.data.SearchFilters
 import com.alfresco.content.listview.ListFragment
 import com.alfresco.content.navigateTo
+import com.alfresco.content.navigateToExtensionFolder
 import com.alfresco.content.navigateToFolder
 
 class SearchResultsFragment : ListFragment<SearchViewModel, SearchResultsState>() {
@@ -69,7 +70,7 @@ class SearchResultsFragment : ListFragment<SearchViewModel, SearchResultsState>(
                     if (parentId.isNullOrEmpty())
                         findNavController().navigateToFolder(entry, state.moveId)
                     else Toast.makeText(requireContext(), getString(R.string.search_move_warning), Toast.LENGTH_SHORT).show()
-                } else findNavController().navigateTo(entry)
+                } else findNavController().navigateToExtensionFolder(entry)
             }
         }
     }