Merge pull request #362 from PermanentOrg/bug/VSP-1616

flaviahandrea-vsp · web-flow · commit d431d5474c3a · 2025-08-01T10:57:19.000+03:00
Fix crash when opening photos from large archives
diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
diff --git a/app/src/main/java/org/permanent/permanent/models/FileSessionData.kt b/app/src/main/java/org/permanent/permanent/models/FileSessionData.kt
@@ -0,0 +1,5 @@
+package org.permanent.permanent.models
+
+object FileSessionData {
+    var records: List<Record>? = null
+}
diff --git a/app/src/main/java/org/permanent/permanent/ui/RecordSearchFragment.kt b/app/src/main/java/org/permanent/permanent/ui/RecordSearchFragment.kt
@@ -16,11 +16,11 @@ import com.google.android.material.chip.Chip
 import com.google.android.material.chip.ChipGroup
 import org.permanent.permanent.R
 import org.permanent.permanent.databinding.FragmentRecordSearchBinding
+import org.permanent.permanent.models.FileSessionData
 import org.permanent.permanent.models.Record
 import org.permanent.permanent.models.Tag
 import org.permanent.permanent.ui.fileView.FileActivity
 import org.permanent.permanent.ui.fileView.FileInfoFragment
-import org.permanent.permanent.ui.myFiles.PARCELABLE_FILES_KEY
 import org.permanent.permanent.ui.myFiles.RecordsListAdapter
 import org.permanent.permanent.viewmodels.RecordSearchViewModel
 
@@ -89,7 +89,7 @@ class RecordSearchFragment : PermanentBaseFragment() {
             if (record.displayFirstInCarousel) recordToView = record
         }
         val intent = Intent(context, FileActivity::class.java)
-        intent.putExtra(PARCELABLE_FILES_KEY, it)
+        FileSessionData.records = it
         startActivityForResult(intent, FileInfoFragment.ACTIVITY_RESULT_REQUEST_CODE)
 
     }
diff --git a/app/src/main/java/org/permanent/permanent/ui/fileView/FileActivity.kt b/app/src/main/java/org/permanent/permanent/ui/fileView/FileActivity.kt
@@ -10,6 +10,7 @@ import androidx.navigation.ui.NavigationUI
 import androidx.navigation.ui.navigateUp
 import org.permanent.permanent.R
 import org.permanent.permanent.databinding.ActivityFileBinding
+import org.permanent.permanent.models.FileSessionData
 import org.permanent.permanent.ui.PREFS_NAME
 import org.permanent.permanent.ui.PreferencesHelper
 import org.permanent.permanent.ui.activities.PermanentBaseActivity
@@ -63,6 +64,11 @@ class FileActivity : PermanentBaseActivity() {
         }
     }
 
+    fun setToolbarAndStatusBarColor(colorId: Int) {
+        binding.fileToolbar.setBackgroundColor(ContextCompat.getColor(this, colorId))
+        window.statusBarColor = ContextCompat.getColor(this, colorId)
+    }
+
     override fun connectViewModelEvents() {
     }
 
@@ -78,9 +84,9 @@ class FileActivity : PermanentBaseActivity() {
         super.onPause()
         disconnectViewModelEvents()
     }
-    
-    fun setToolbarAndStatusBarColor(colorId: Int) {
-        binding.fileToolbar.setBackgroundColor(ContextCompat.getColor(this, colorId))
-        window.statusBarColor = ContextCompat.getColor(this, colorId)
+
+    override fun onDestroy() {
+        super.onDestroy()
+        FileSessionData.records = null
     }
 }
diff --git a/app/src/main/java/org/permanent/permanent/ui/fileView/FilesContainerFragment.kt b/app/src/main/java/org/permanent/permanent/ui/fileView/FilesContainerFragment.kt
@@ -1,14 +1,18 @@
 package org.permanent.permanent.ui.fileView
 
 import android.os.Bundle
-import android.view.*
+import android.view.LayoutInflater
+import android.view.Menu
+import android.view.MenuInflater
+import android.view.View
+import android.view.ViewGroup
 import androidx.lifecycle.ViewModelProvider
 import org.permanent.permanent.DevicePermissionsHelper
 import org.permanent.permanent.R
 import org.permanent.permanent.databinding.FragmentFilesContainerBinding
+import org.permanent.permanent.models.FileSessionData
 import org.permanent.permanent.models.Record
 import org.permanent.permanent.ui.PermanentBaseFragment
-import org.permanent.permanent.ui.myFiles.PARCELABLE_FILES_KEY
 import org.permanent.permanent.viewmodels.FilesContainerViewModel
 
 class FilesContainerFragment : PermanentBaseFragment() {
@@ -42,7 +46,8 @@ class FilesContainerFragment : PermanentBaseFragment() {
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        arguments?.getParcelableArrayList<Record>(PARCELABLE_FILES_KEY)?.let {
+        val records = FileSessionData.records
+        records?.let {
             viewAdapter = FilesContainerPagerAdapter(this, it)
             val viewPager = binding.vpFileView
             viewPager.adapter = viewAdapter
@@ -51,7 +56,7 @@ class FilesContainerFragment : PermanentBaseFragment() {
         }
     }
 
-    private fun getFileIndexToStartWith(files: ArrayList<Record>): Int {
+    private fun getFileIndexToStartWith(files: List<Record>): Int {
         for ((index, file) in files.withIndex())
             if (file.displayFirstInCarousel) return index
         return 0
diff --git a/app/src/main/java/org/permanent/permanent/ui/fileView/FilesContainerPagerAdapter.kt b/app/src/main/java/org/permanent/permanent/ui/fileView/FilesContainerPagerAdapter.kt
@@ -6,7 +6,7 @@ import androidx.fragment.app.FragmentStatePagerAdapter
 import org.permanent.permanent.models.Record
 import org.permanent.permanent.ui.myFiles.PARCELABLE_RECORD_KEY
 
-class FilesContainerPagerAdapter(val fragment: Fragment, private val files: MutableList<Record>
+class FilesContainerPagerAdapter(val fragment: Fragment, private val files: List<Record>
 ) : FragmentStatePagerAdapter(fragment.childFragmentManager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) {
 
     override fun getCount(): Int = files.size
diff --git a/app/src/main/java/org/permanent/permanent/ui/myFiles/MyFilesFragment.kt b/app/src/main/java/org/permanent/permanent/ui/myFiles/MyFilesFragment.kt
@@ -32,6 +32,7 @@ import org.permanent.permanent.databinding.DialogRenameRecordBinding
 import org.permanent.permanent.databinding.FragmentMyFilesBinding
 import org.permanent.permanent.models.AccountEventAction
 import org.permanent.permanent.models.Download
+import org.permanent.permanent.models.FileSessionData
 import org.permanent.permanent.models.NavigationFolderIdentifier
 import org.permanent.permanent.models.Record
 import org.permanent.permanent.network.models.ChecklistItem
@@ -324,8 +325,8 @@ class MyFilesFragment : PermanentBaseFragment() {
     }
 
     private val onFileViewRequest = Observer<ArrayList<Record>> {
-        val bundle = bundleOf(PARCELABLE_FILES_KEY to it)
-        findNavController().navigate(R.id.action_myFilesFragment_to_fileActivity, bundle)
+        FileSessionData.records = it
+        findNavController().navigate(R.id.action_myFilesFragment_to_fileActivity)
     }
 
     private val onRecordSelectedObserver = Observer<Record> {
diff --git a/app/src/main/java/org/permanent/permanent/ui/public/PublicArchiveFragment.kt b/app/src/main/java/org/permanent/permanent/ui/public/PublicArchiveFragment.kt
@@ -15,12 +15,12 @@ import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import org.permanent.permanent.R
 import org.permanent.permanent.databinding.FragmentPublicArchiveBinding
+import org.permanent.permanent.models.FileSessionData
 import org.permanent.permanent.models.Record
 import org.permanent.permanent.ui.PREFS_NAME
 import org.permanent.permanent.ui.PermanentBaseFragment
 import org.permanent.permanent.ui.PreferencesHelper
 import org.permanent.permanent.ui.Workspace
-import org.permanent.permanent.ui.myFiles.PARCELABLE_FILES_KEY
 import org.permanent.permanent.ui.myFiles.PARCELABLE_RECORD_KEY
 import org.permanent.permanent.ui.myFiles.RecordListener
 import org.permanent.permanent.ui.myFiles.RecordOptionsFragment
@@ -86,9 +86,9 @@ class PublicArchiveFragment : PermanentBaseFragment(), RecordListener {
     }
 
     private val onFileViewRequest = Observer<ArrayList<Record>> {
-        val bundle = bundleOf(PARCELABLE_FILES_KEY to it)
+        FileSessionData.records = it
         requireParentFragment().findNavController()
-            .navigate(R.id.action_publicFragment_to_fileActivity, bundle)
+            .navigate(R.id.action_publicFragment_to_fileActivity)
     }
 
     private val onFolderViewRequest = Observer<Record> {
diff --git a/app/src/main/java/org/permanent/permanent/ui/public/PublicFilesFragment.kt b/app/src/main/java/org/permanent/permanent/ui/public/PublicFilesFragment.kt
@@ -32,6 +32,7 @@ import org.permanent.permanent.databinding.DialogRenameRecordBinding
 import org.permanent.permanent.databinding.FragmentPublicFilesBinding
 import org.permanent.permanent.models.AccountEventAction
 import org.permanent.permanent.models.Download
+import org.permanent.permanent.models.FileSessionData
 import org.permanent.permanent.models.NavigationFolderIdentifier
 import org.permanent.permanent.models.Record
 import org.permanent.permanent.network.models.ChecklistItem
@@ -259,8 +260,8 @@ class PublicFilesFragment : PermanentBaseFragment() {
     }
 
     private val onFileViewRequest = Observer<ArrayList<Record>> {
-        val bundle = bundleOf(PARCELABLE_FILES_KEY to it)
-        findNavController().navigate(R.id.action_publicFilesFragment_to_fileActivity, bundle)
+        FileSessionData.records = it
+        findNavController().navigate(R.id.action_publicFilesFragment_to_fileActivity)
     }
 
     private val shrinkIslandRequestObserver = Observer<Void?> {
diff --git a/app/src/main/java/org/permanent/permanent/ui/public/PublicFolderFragment.kt b/app/src/main/java/org/permanent/permanent/ui/public/PublicFolderFragment.kt
@@ -6,7 +6,6 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.appcompat.app.AppCompatActivity
-import androidx.core.os.bundleOf
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProvider
@@ -16,13 +15,13 @@ import androidx.recyclerview.widget.RecyclerView
 import com.google.android.material.snackbar.Snackbar
 import org.permanent.permanent.R
 import org.permanent.permanent.databinding.FragmentPublicFolderBinding
+import org.permanent.permanent.models.FileSessionData
 import org.permanent.permanent.models.Record
 import org.permanent.permanent.ui.PREFS_NAME
 import org.permanent.permanent.ui.PermanentBaseFragment
 import org.permanent.permanent.ui.PreferencesHelper
 import org.permanent.permanent.ui.Workspace
 import org.permanent.permanent.ui.fileView.FileViewOptionsFragment
-import org.permanent.permanent.ui.myFiles.PARCELABLE_FILES_KEY
 import org.permanent.permanent.ui.myFiles.PARCELABLE_RECORD_KEY
 import org.permanent.permanent.ui.myFiles.RecordListener
 import org.permanent.permanent.ui.myFiles.RecordOptionsFragment
@@ -66,9 +65,9 @@ class PublicFolderFragment : PermanentBaseFragment(), RecordListener {
     }
 
     private val onFileViewRequest = Observer<ArrayList<Record>> {
-        val bundle = bundleOf(PARCELABLE_FILES_KEY to it)
+        FileSessionData.records = it
         requireParentFragment().findNavController()
-            .navigate(R.id.action_publicFolderFragment_to_fileActivity, bundle)
+            .navigate(R.id.action_publicFolderFragment_to_fileActivity)
     }
 
     private val onFolderNameChanged = Observer<String> {
diff --git a/app/src/main/java/org/permanent/permanent/ui/shares/SharedXMeFragment.kt b/app/src/main/java/org/permanent/permanent/ui/shares/SharedXMeFragment.kt
@@ -32,6 +32,7 @@ import org.permanent.permanent.databinding.DialogRenameRecordBinding
 import org.permanent.permanent.databinding.DialogTitleTextTwoButtonsBinding
 import org.permanent.permanent.databinding.FragmentSharedXMeBinding
 import org.permanent.permanent.models.Download
+import org.permanent.permanent.models.FileSessionData
 import org.permanent.permanent.models.NavigationFolderIdentifier
 import org.permanent.permanent.models.Record
 import org.permanent.permanent.network.models.ChecklistItem
@@ -301,9 +302,9 @@ class SharedXMeFragment : PermanentBaseFragment() {
     private val onFileViewRequest = Observer<Record> {
         val files = ArrayList<Record>()
         files.add(it)
-        val bundle = bundleOf(PARCELABLE_FILES_KEY to files)
+        FileSessionData.records = files
         requireParentFragment().findNavController()
-            .navigate(R.id.action_sharesFragment_to_fileActivity, bundle)
+            .navigate(R.id.action_sharesFragment_to_fileActivity)
     }
 
     private val relocationCancellationObserver = Observer<Void?> {

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@ import androidx.navigation.ui.NavigationUI`
`10`	`10`	`import androidx.navigation.ui.navigateUp`
`11`	`11`	`import org.permanent.permanent.R`
`12`	`12`	`import org.permanent.permanent.databinding.ActivityFileBinding`
	`13`	`+import org.permanent.permanent.models.FileSessionData`
`13`	`14`	`import org.permanent.permanent.ui.PREFS_NAME`
`14`	`15`	`import org.permanent.permanent.ui.PreferencesHelper`
`15`	`16`	`import org.permanent.permanent.ui.activities.PermanentBaseActivity`
`@@ -63,6 +64,11 @@ class FileActivity : PermanentBaseActivity() {`
`63`	`64`	`}`
`64`	`65`	`}`
`65`	`66`
	`67`	`+ fun setToolbarAndStatusBarColor(colorId: Int) {`
	`68`	`+ binding.fileToolbar.setBackgroundColor(ContextCompat.getColor(this, colorId))`
	`69`	`+ window.statusBarColor = ContextCompat.getColor(this, colorId)`
	`70`	`+ }`
	`71`	`+`
`66`	`72`	`override fun connectViewModelEvents() {`
`67`	`73`	`}`
`68`	`74`
`@@ -78,9 +84,9 @@ class FileActivity : PermanentBaseActivity() {`
`78`	`84`	`super.onPause()`
`79`	`85`	`disconnectViewModelEvents()`
`80`	`86`	`}`
`81`		`-`
`82`		`- fun setToolbarAndStatusBarColor(colorId: Int) {`
`83`		`- binding.fileToolbar.setBackgroundColor(ContextCompat.getColor(this, colorId))`
`84`		`- window.statusBarColor = ContextCompat.getColor(this, colorId)`
	`87`	`+`
	`88`	`+ override fun onDestroy() {`
	`89`	`+ super.onDestroy()`
	`90`	`+ FileSessionData.records = null`
`85`	`91`	`}`
`86`	`92`	`}`