fix media picking ui with selection on single click

Author: surinder-tsys

app/src/main/java/com/owncloud/android/ui/adapter/OCFileListDelegate.kt

@@ -34,6 +34,7 @@ import com.owncloud.android.ui.activity.ComponentsGetter
 import com.owncloud.android.ui.fragment.GalleryFragment
 import com.owncloud.android.ui.fragment.SearchType
 import com.owncloud.android.ui.fragment.albums.AlbumItemsFragment
+import com.owncloud.android.ui.fragment.albums.AlbumsPickerActivity
 import com.owncloud.android.ui.interfaces.OCFileListFragmentInterface
 import com.owncloud.android.utils.BitmapUtils
 import com.owncloud.android.utils.DisplayUtils
@@ -114,9 +115,16 @@ class OCFileListDelegate(
         )
 
         imageView.setOnClickListener {
-            ocFileListFragmentInterface.onItemClicked(file)
-            GalleryFragment.setLastMediaItemPosition(galleryRowHolder.absoluteAdapterPosition)
-            AlbumItemsFragment.lastMediaItemPosition = galleryRowHolder.absoluteAdapterPosition
+            // NMC Customization: while picking media directly perform long click
+            if (context is AlbumsPickerActivity) {
+                ocFileListFragmentInterface.onLongItemClicked(
+                    file
+                )
+            } else {
+                ocFileListFragmentInterface.onItemClicked(file)
+                GalleryFragment.setLastMediaItemPosition(galleryRowHolder.absoluteAdapterPosition)
+                AlbumItemsFragment.lastMediaItemPosition = galleryRowHolder.absoluteAdapterPosition
+            }
         }
 
         if (!hideItemOptions) {

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

@@ -100,7 +100,12 @@ public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         searchFragment = true;
 
-        setHasOptionsMenu(true);
+        if (getArguments() != null) {
+            isFromAlbum = getArguments().getBoolean(AlbumsPickerActivity.Companion.getEXTRA_FROM_ALBUM(), false);
+        }
+
+        // NMC Customization: only show menu when not opened from media picker
+        setHasOptionsMenu(!isFromAlbum);
 
         if (galleryFragmentBottomSheetDialog == null) {
             galleryFragmentBottomSheetDialog = new GalleryFragmentBottomSheetDialog(this);
@@ -113,10 +118,6 @@ public void onCreate(Bundle savedInstanceState) {
         }
 
         registerRefreshSearchEventReceiver();
-
-        if (getArguments() != null) {
-            isFromAlbum = getArguments().getBoolean(AlbumsPickerActivity.Companion.getEXTRA_FROM_ALBUM(), false);
-        }
     }
 
     private void registerRefreshSearchEventReceiver() {
@@ -425,6 +426,11 @@ public void showAllGalleryItems() {
     }
 
     private void updateSubtitle(GalleryFragmentBottomSheetDialog.MediaState mediaState) {
+        // NMC Customization: while picking media don't show subtitle
+        if (isFromAlbum) {
+            return;
+        }
+
         requireActivity().runOnUiThread(() -> {
             if (!isAdded()) {
                 return;