[stable-3.28] Files

app/src/main/java/com/nmc/android/utils/KeyboardUtils.java

@@ -0,0 +1,21 @@
+package com.nmc.android.utils;
+
+import android.app.Activity;
+import android.content.Context;
+import android.view.View;
+import android.view.inputmethod.InputMethodManager;
+
+public class KeyboardUtils {
+
+    public static void showSoftKeyboard(Context context, View view) {
+        view.requestFocus();
+        InputMethodManager imm = (InputMethodManager) context.getSystemService(Context.INPUT_METHOD_SERVICE);
+        imm.showSoftInput(view, InputMethodManager.SHOW_IMPLICIT);
+    }
+
+    public static void hideKeyboardFrom(Context context, View view) {
+        view.clearFocus();
+        InputMethodManager imm = (InputMethodManager) context.getSystemService(Activity.INPUT_METHOD_SERVICE);
+        imm.hideSoftInputFromWindow(view.getWindowToken(), 0);
+    }
+}

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

@@ -139,6 +139,7 @@
 import com.owncloud.android.utils.MimeTypeUtil;
 import com.owncloud.android.utils.PermissionUtil;
 import com.owncloud.android.utils.PushUtils;
+import com.nmc.android.utils.KeyboardUtils;
 import com.owncloud.android.utils.StringUtils;
 import com.owncloud.android.utils.theme.CapabilityUtils;
 
@@ -1039,6 +1040,8 @@ private void popBack() {
         binding.fabMain.setImageResource(R.drawable.ic_plus);
         resetScrolling(true);
         showSortListGroup(false);
+        // hide the keyboard on back press if showing
+        KeyboardUtils.hideKeyboardFrom(this, binding.getRoot());
         super.onBackPressed();
     }
 

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

@@ -105,6 +105,7 @@
 import java.util.Calendar;
 import java.util.List;
 import java.util.Stack;
+import java.util.stream.Collectors;
 
 import javax.inject.Inject;
 
@@ -742,6 +743,10 @@ private void populateDirectoryList() {
         if (mFile != null) {
             List<OCFile> files = getStorageManager().getFolderContent(mFile, false);
 
+            // NMC-2893 Task
+            // Filtering and showing only files which are folder
+            files = files.stream().filter(OCFile::isFolder).collect(Collectors.toList());
+
             if (files.isEmpty()) {
                 setMessageForEmptyList(R.string.file_list_empty_headline, R.string.empty,
                                        R.drawable.uploads);

app/src/main/java/com/owncloud/android/ui/fragment/UnifiedSearchFragment.kt

@@ -39,6 +39,7 @@ import com.nextcloud.client.account.CurrentAccountProvider
 import com.nextcloud.client.core.AsyncRunner
 import com.nextcloud.client.di.Injectable
 import com.nextcloud.client.di.ViewModelFactory
+import com.nmc.android.utils.KeyboardUtils
 import com.nextcloud.client.network.ClientFactory
 import com.owncloud.android.R
 import com.owncloud.android.databinding.ListFragmentBinding
@@ -221,6 +222,8 @@ class UnifiedSearchFragment :
     private fun showFile(file: OCFile, showFileActions: Boolean) {
         activity.let {
             if (activity is FileDisplayActivity) {
+                // NMC: hide keyboard when user taps on any file to view
+                KeyboardUtils.hideKeyboardFrom(requireContext(), binding.root)
                 val fda = activity as FileDisplayActivity
                 fda.file = file
 
@@ -280,6 +283,7 @@ class UnifiedSearchFragment :
     }
 
     override fun onQueryTextSubmit(query: String): Boolean {
+        KeyboardUtils.hideKeyboardFrom(requireContext(), binding.root)
         vm.setQuery(query)
         vm.initialQuery()
         return true