Merge pull request #1315 from Infomaniak/fix/share-folder-add-contact…

…s-one-by-one Fix contacts being added when “done” is clicked repeatedly when sharing a folder
Infomaniak · May 28, 2024 · 3269260 · 3269260
2 parents bd416af + f6161d0
commit 3269260
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 2 deletions.
diff --git a/...rc/main/java/com/infomaniak/drive/ui/fileList/fileShare/AvailableShareableItemsAdapter.kt b/...rc/main/java/com/infomaniak/drive/ui/fileList/fileShare/AvailableShareableItemsAdapter.kt
@@ -132,7 +132,15 @@ class AvailableShareableItemsAdapter(
     override fun getFilter(): Filter {
         return object : Filter() {
             override fun performFiltering(constraint: CharSequence?): FilterResults {
-                val searchTerm = constraint?.standardize() ?: ""
+                if (constraint.isNullOrBlank()) {
+                    return FilterResults().apply {
+                        values = arrayListOf<Shareable>()
+                        count = 0
+                    }
+                }
+
+                val searchTerm = constraint.standardize()
+
                 val finalUserList = initialList
                     .filter {
                         it.getFilterValue().standardize()

diff --git a/app/src/main/java/com/infomaniak/drive/utils/Extensions.kt b/app/src/main/java/com/infomaniak/drive/utils/Extensions.kt
@@ -229,7 +229,7 @@ fun MaterialAutoCompleteTextView.setupAvailableShareableItems(
         onDataPassed(item)
     }
     setAdapter(availableUsersAdapter)
-    handleActionDone { !availableUsersAdapter.addFirstAvailableItem() }
+    handleActionDone { if (text.isNotBlank()) !availableUsersAdapter.addFirstAvailableItem() }
 
     return availableUsersAdapter
 }

diff --git a/app/src/main/res/layout/fragment_bottom_sheet_file_share.xml b/app/src/main/res/layout/fragment_bottom_sheet_file_share.xml
@@ -84,6 +84,7 @@
                         android:imeOptions="actionDone"
                         android:inputType="textEmailAddress"
                         android:maxLines="1"
+                        android:completionThreshold="1"
                         android:textSize="16sp" />
                 </LinearLayout>
             </com.google.android.material.card.MaterialCardView>

diff --git a/app/src/main/res/layout/fragment_file_share_details.xml b/app/src/main/res/layout/fragment_file_share_details.xml
@@ -67,6 +67,7 @@
                     android:imeOptions="actionDone"
                     android:inputType="textEmailAddress"
                     android:maxLines="1"
+                    android:completionThreshold="1"
                     android:textSize="16sp" />
 
             </com.google.android.material.textfield.TextInputLayout>