Merge branch 'main' into naveensingh/disable-autoplay-on-seek

Author: naveensingh

CHANGELOG.md

@@ -5,9 +5,14 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+
 ### Changed
 - Player now respects play/pause state when seeking
 
+### Fixed
+- Fixed crash in editor when launched from other apps ([#786])
+
+
 ## [1.9.0] - 2025-11-08
 ### Changed
 - Restored ability to show/hide notch area ([#749])
@@ -241,6 +246,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 [#752]: https://github.com/FossifyOrg/Gallery/issues/752
 [#754]: https://github.com/FossifyOrg/Gallery/issues/754
 [#759]: https://github.com/FossifyOrg/Gallery/issues/759
+[#786]: https://github.com/FossifyOrg/Gallery/issues/786
 
 [Unreleased]: https://github.com/FossifyOrg/Gallery/compare/1.9.0...HEAD
 [1.9.0]: https://github.com/FossifyOrg/Gallery/compare/1.8.1...1.9.0

app/src/main/kotlin/org/fossify/gallery/activities/EditActivity.kt

@@ -8,7 +8,7 @@ import android.net.Uri
 import android.os.Bundle
 import android.os.Handler
 import android.provider.MediaStore
-import android.widget.RelativeLayout
+import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.core.graphics.scale
 import androidx.core.net.toUri
 import androidx.exifinterface.media.ExifInterface
@@ -130,8 +130,15 @@ class EditActivity : BaseCropActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(binding.root)
+        isCropIntent = intent.extras?.get(CROP) == "true"
         setupEdgeToEdge(
-            padBottomSystem = listOf(binding.bottomEditorPrimaryActions.root)
+            padBottomSystem = listOf(
+                if (isCropIntent) {
+                    binding.bottomEditorCropRotateActions.root
+                } else {
+                    binding.bottomEditorPrimaryActions.root
+                }
+            )
         )
 
         if (checkAppSideloading()) {
@@ -210,10 +217,15 @@ class EditActivity : BaseCropActivity() {
             else -> uri!!
         }
 
-        isCropIntent = extras?.get(CROP) == "true"
         if (isCropIntent) {
             binding.bottomEditorPrimaryActions.root.beGone()
-            (binding.bottomEditorCropRotateActions.root.layoutParams as RelativeLayout.LayoutParams).addRule(RelativeLayout.ALIGN_PARENT_BOTTOM, 1)
+
+            val params = binding.bottomEditorCropRotateActions.root.layoutParams as? ConstraintLayout.LayoutParams
+            if (params != null) {
+                params.bottomToBottom = binding.activityEditHolder.id
+                binding.bottomEditorCropRotateActions.root.layoutParams = params
+            }
+
             binding.editorToolbar.menu.findItem(R.id.overwrite_original).isVisible = false
         }
 

gradle/libs.versions.toml

@@ -2,7 +2,7 @@
 #jetbrains
 kotlin = "2.2.21"
 #KSP
-ksp = "2.3.0"
+ksp = "2.3.2"
 #Detekt
 detekt = "1.23.8"
 detektCompose = "0.4.27"
@@ -14,9 +14,9 @@ androidx-documentfile = "1.1.0"
 #exif
 exif = "1.0.1"
 #Room
-room = "2.8.3"
+room = "2.8.4"
 #Fossify
-commons = "5.7.2"
+commons = "5.7.3"
 #Gradle4
 gradlePlugins-agp = "8.11.1"
 #Other
@@ -31,8 +31,8 @@ androidsvgAar = "1.4"
 androidphotofilters = "193f2ae509"
 sanselan = "0.97-incubator"
 media3Exoplayer = "1.8.0"
-okhttp = "5.3.0"
-okio = "3.16.2"
+okhttp = "5.3.2"
+okio = "3.16.4"
 picasso = "2.71828"
 subsamplingScaleImageView = "d705c3c4ad"
 #build