Merge pull request #7 from smartdevelopers-ir/changes_for_android_11

2022/02/24

Author: smartdevelopers-ir

SmartFileBrowser/build.gradle

@@ -31,7 +31,7 @@ android {
     }
 }
 group = 'ir.smartdevelopers'
-version = '1.4.4'
+version = '1.4.6'
 task sourcesJar(type: Jar) {
     archiveClassifier.set("sources")
     from android.sourceSets.main.java.srcDirs

SmartFileBrowser/src/main/java/ir/smartdevelopers/smartfilebrowser/acitivties/FileBrowserMainActivity.java

@@ -1445,11 +1445,9 @@ public int getGalleryItemSelectionCount() {
 
     public void imageUpdated(String newFilePath, int editedImagePosition) {
         if (mGalleryAdapter != null) {
-            mGalleryAdapter.getItem(editedImagePosition).setPath(newFilePath);
-            mGalleryAdapter.getItem(editedImagePosition)
-                    .setUri(FileProvider.getUriForFile(getApplicationContext(),
-                            getPackageName()+".sfb_provider",new File(newFilePath)));
-
+            Uri updatedFileUri=FileProvider.getUriForFile(getApplicationContext(),
+                    getPackageName()+".sfb_provider",new File(newFilePath));
+            mGalleryAdapter.updateSelectedFile(newFilePath,editedImagePosition,updatedFileUri);
             if (Build.VERSION.SDK_INT < 21) {
                 mGalleryAdapter.notifyItemChanged(editedImagePosition);
             }

SmartFileBrowser/src/main/java/ir/smartdevelopers/smartfilebrowser/adapters/GalleryAdapter.java

@@ -1,5 +1,6 @@
 package ir.smartdevelopers.smartfilebrowser.adapters;
 
+import android.net.Uri;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -37,10 +38,13 @@ public class GalleryAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder
     private List<GalleryModel> mGalleryModels;
     private List<File> mSelectedFiles;
     private boolean mCanSelectMultiple=true;
+    /**Listener for selecting multiple image or tick checkboxes*/
     private OnItemSelectListener<FileModel> mOnItemSelectListener;
+    /** This listener is for handling clicks for images or camera icon*/
     private OnItemClickListener<GalleryModel> mOnItemClickListener;
     private OnItemClickListener<GalleryModel> mOnZoomOutClickListener;
     private OnItemLongClickListener<GalleryModel> mOnItemLongClickListener;
+    /**If can not select multiple image when clicking on image it choose as only image this listener send result back*/
     private OnItemChooseListener mOnItemChooseListener;
 
 
@@ -206,6 +210,18 @@ public List<GalleryModel> getGalleryModels() {
         return mGalleryModels;
     }
 
+    public void updateSelectedFile(String newFilePath, int editedImagePosition, Uri updatedFileUri) {
+        File previousFile=getItem(editedImagePosition).getCurrentFile();
+        if (previousFile!=null){
+            int selectedFilePos=mSelectedFiles.indexOf(previousFile);
+            if (selectedFilePos!=-1){
+                mSelectedFiles.set(selectedFilePos,new File(newFilePath));
+            }
+        }
+        getItem(editedImagePosition).setPath(newFilePath);
+        getItem(editedImagePosition).setUri(updatedFileUri);
+    }
+
     class CameraViewHolder extends RecyclerView.ViewHolder {
         AppCompatImageView mImageView;
         public CameraViewHolder(@NonNull View itemView) {