Skip to content

ADFA-3122 | Fix editor viewport and buffer persistence on configuration change #1066

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jatezzz merged 3 commits into from
Mar 12, 2026
Merged

ADFA-3122 | Fix editor viewport and buffer persistence on configuration change #1066

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8bdc46e
fix(editor): preserve scroll position and file timestamps on configur…
jatezzz Mar 11, 2026
ac0e79b
fix: Make fileTimestamps thread-safe
jatezzz Mar 12, 2026
3736eda
Merge branch 'stage' into fix/ADFA-3122-editor-state-on-configuration…
jatezzz Mar 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 18 additions & 1 deletion app/src/main/java/com/itsaky/androidide/activities/editor/EditorHandlerActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
package com.itsaky.androidide.activities.editor

import android.content.Intent
import android.content.res.Configuration
import android.os.Bundle
import android.text.TextUtils
import android.util.Log
Expand All @@ -26,6 +27,7 @@ import android.view.ViewGroup.LayoutParams
import androidx.collection.MutableIntObjectMap
import androidx.core.content.res.ResourcesCompat
import androidx.core.view.GravityCompat
import androidx.core.view.doOnNextLayout
import androidx.lifecycle.lifecycleScope
import com.blankj.utilcode.util.ImageUtils
import com.google.android.material.tabs.TabLayout
Expand Down Expand Up @@ -79,6 +81,7 @@ import org.adfa.constants.CONTENT_KEY
import org.greenrobot.eventbus.Subscribe
import org.greenrobot.eventbus.ThreadMode
import java.io.File
import java.util.concurrent.ConcurrentHashMap
import java.util.concurrent.CopyOnWriteArrayList
import java.util.concurrent.atomic.AtomicBoolean
import java.util.function.Consumer
Expand All @@ -100,7 +103,7 @@ open class EditorHandlerActivity :

protected val isOpenedFilesSaved = AtomicBoolean(false)

private val fileTimestamps = mutableMapOf<String, Long>()
private val fileTimestamps = ConcurrentHashMap<String, Long>()

private val pluginTabIndices = mutableMapOf<String, Int>()
private val tabIndexToPluginId = mutableMapOf<Int, String>()
Expand Down Expand Up @@ -704,6 +707,16 @@ open class EditorHandlerActivity :
}
}

override fun onConfigurationChanged(newConfig: Configuration) {
super.onConfigurationChanged(newConfig)

getCurrentEditor()?.editor?.apply {
doOnNextLayout {
cursor?.let { c -> ensurePositionVisible(c.leftLine, c.leftColumn, true) }
}
}
}

private suspend fun saveResultInternal(
index: Int,
result: SaveResult,
Expand All @@ -723,6 +736,10 @@ open class EditorHandlerActivity :
return false
}

frag.file?.let { savedFile ->
fileTimestamps[savedFile.absolutePath] = savedFile.lastModified()
}

val isGradle = fileName.endsWith(".gradle") || fileName.endsWith(".gradle.kts")
val isXml: Boolean = fileName.endsWith(".xml")
if (!result.gradleSaved) {
Expand Down
Loading