Merge remote-tracking branch 'origin/main' into auto-update-tab-after-extract

Author: Jan Guegel

CHANGELOG.md

@@ -8,7 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 - Fixed folders showing up incorrectly as files in copy/move dialog ([#267])
 - Fixed error when saving files with unsupported characters ([#250])
-- Fixed File manager does not ask for file access permission if opened for the first time via "share" dialog ([#85])
+- Fixed missing permission prompt on initial "Save as" launch ([#85])
 
 ## [1.2.3] - 2025-09-15
 ### Fixed

app/src/main/kotlin/org/fossify/filemanager/activities/MainActivity.kt

@@ -310,7 +310,7 @@ class MainActivity : SimpleActivity() {
         }
     }
 
-        private fun initFileManager(refreshRecents: Boolean) {
+    private fun initFileManager(refreshRecents: Boolean) {
         if (intent.action == Intent.ACTION_VIEW && intent.data != null) {
             val data = intent.data
             if (data?.scheme == "file") {

app/src/main/kotlin/org/fossify/filemanager/activities/SaveAsActivity.kt

@@ -15,8 +15,7 @@ import java.io.File
 class SaveAsActivity : SimpleActivity() {
     private val binding by viewBinding(ActivitySaveAsBinding::inflate)
 
-
-        override fun onCreate(savedInstanceState: Bundle?) {
+    override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(binding.root)
         tryInitFileManager()
@@ -32,6 +31,7 @@ class SaveAsActivity : SimpleActivity() {
             }
         }
     }
+
     private fun saveAsDialog() {
         if (intent.action == Intent.ACTION_SEND && intent.extras?.containsKey(Intent.EXTRA_STREAM) == true) {
             FilePickerDialog(this, pickFile = false, showHidden = config.shouldShowHidden(), showFAB = true, showFavoritesButton = true) {

app/src/main/kotlin/org/fossify/filemanager/activities/SimpleActivity.kt

@@ -45,17 +45,12 @@ open class SimpleActivity : BaseSimpleActivity() {
 
     override fun getRepositoryName() = "File-Manager"
 
-    @SuppressLint("NewApi")
-    override fun onActivityResult(requestCode: Int, resultCode: Int, dataIntent: Intent?) {
-        super.onActivityResult(requestCode, resultCode, dataIntent)
-
+   @SuppressLint("NewApi")
+    override fun onActivityResult(requestCode: Int, resultCode: Int, resultData: Intent?) {
+        super.onActivityResult(requestCode, resultCode, resultData)
+        isAskingPermissions = false
         if (requestCode == MANAGE_STORAGE_RC && isRPlus()) {
-            if (Environment.isExternalStorageManager()) {
-                recreate()
-            } else {
-                toast(R.string.no_storage_permissions)
-                finish()
-            }
+            actionOnPermission?.invoke(Environment.isExternalStorageManager())
         }
     }