Merged
Conversation
Collaborator
Generated by 🚫 Danger |
* Remove isEditorStarted flag to fix content loss during activity restart The isEditorStarted flag was preventing editor reinitialization during activity restarts, but this caused content loss because: 1. Activity restart triggers new fragment creation 2. isEditorStarted gets reset to false in onDestroy() 3. startWithEditorSettings() gets called but always rebuilds from original data 4. Current editor content is lost instead of being preserved Root cause: The flag was designed to prevent duplicate initialization within a single fragment instance, but during activity restarts, we WANT the editor to reinitialize with the current content, not block reinitialization entirely. Changes: - Remove isEditorStarted field and related state management - Remove isEditorStarted checks in startWithEditorSettings() - Allow editor to reinitialize after activity restart - Fixes content loss during dark mode toggle * Fix double ViewPager setup during auth state changes Prevent duplicate editor initialization by: 1. Only calling fetchWpComCookies() if not already in Success state 2. Adding ViewPager state check to prevent duplicate setup 3. Using distinctUntilChanged() to prevent duplicate LiveData emissions 4. Consolidating Success handling logic in handleSuccessfulAuth() Changes: - Check auth state before calling fetchWpComCookies() - Add ViewPager adapter check with error logging for duplicate setup attempts - Add distinctUntilChanged() to auth state observer - Extract handleSuccessfulAuth() for consistent Success state handling - Remove debug logging from production code
oguzkocer
force-pushed
the
merge/release-26.1-into-trunk
branch
from
3feada7 to
b4e577b
Compare
oguzkocer
approved these changes
Aug 15, 2025
Contributor
Author
Project manifest changes for WordPressThe following changes in the --- ./build/reports/diff_manifest/WordPress/wordpressVanillaRelease/base_manifest.txt 2025-08-15 20:00:32.605630562 +0000
+++ ./build/reports/diff_manifest/WordPress/wordpressVanillaRelease/head_manifest.txt 2025-08-15 20:00:40.095658973 +0000
@@ -2,8 +2,8 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.wordpress.android"
android:installLocation="auto"
- android:versionCode="1471"
- android:versionName="26.1-rc-1" >
+ android:versionCode="1472"
+ android:versionName="26.1" >
<uses-sdk
android:minSdkVersion="26"Go to https://buildkite.com/automattic/wordpress-android/builds/23085/canvas?sid=0198af4d-c857-4985-9433-396706c8733e, click on the |
Contributor
Author
Project manifest changes for WordPressThe following changes in the --- ./build/reports/diff_manifest/WordPress/jetpackVanillaRelease/base_manifest.txt 2025-08-15 20:00:48.326173837 +0000
+++ ./build/reports/diff_manifest/WordPress/jetpackVanillaRelease/head_manifest.txt 2025-08-15 20:00:55.956250763 +0000
@@ -2,8 +2,8 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.jetpack.android"
android:installLocation="auto"
- android:versionCode="1471"
- android:versionName="26.1-rc-1" >
+ android:versionCode="1472"
+ android:versionName="26.1" >
<uses-sdk
android:minSdkVersion="26"Go to https://buildkite.com/automattic/wordpress-android/builds/23085/canvas?sid=0198af4d-c858-423d-bbed-9077de10a9d3, click on the |
|
Contributor
Author
|
| App Name |  Jetpack |
|
| Flavor | Jalapeno | |
| Build Type | Debug | |
| Version | pr22138-b4e577b | |
| Commit | b4e577b | |
| Direct Download | jetpack-prototype-build-pr22138-b4e577b.apk |
Contributor
Author
|
| App Name |  WordPress |
|
| Flavor | Jalapeno | |
| Build Type | Debug | |
| Version | pr22138-b4e577b | |
| Commit | b4e577b | |
| Direct Download | wordpress-prototype-build-pr22138-b4e577b.apk |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Merging
release/26.1intotrunk.Via intermediate branch
merge/release-26.1-into-trunk, to help fix conflicts if any: