Skip to content

Commit 119e6c3

Browse files
Merge release/26.1 into trunk (#22138)
* Revert "Implement GutenbergKit ViewModel Architecture (#22087)" (#22127) This reverts commit 890d484. * Fix `GutenbergKit` editor issues during dark mode toggle (#22135) * 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 * Update translations * Update translations * Bump version number * Update WordPress metadata translations for 26.1 * Update Jetpack metadata translations for 26.1 --------- Co-authored-by: Oguz Kocer <[email protected]>
1 parent 373c074 commit 119e6c3

File tree

87 files changed

+2583
-1899
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

87 files changed

+2583
-1899
lines changed

WordPress/src/jetpack/res/values-es/strings.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,10 @@ Language: es
1212
<string name="login_prologue_revamped_jetpack_feature_text_15">Escribe desde cualquier lugar</string>
1313
<string name="missing_splits_dialog_message">Faltan componentes necesarios en la aplicación de Jetpack, por lo que tendrás que volver a instalarla desde la Google Play Store.</string>
1414
<string name="me_btn_share">Compartir Jetpack con un amigo</string>
15+
<string name="login_prologue_revamped_jetpack_feature_text_14">Publicar una foto</string>
1516
<string name="login_prologue_revamped_jetpack_feature_text_11">Publicar una foto</string>
1617
<string name="login_prologue_revamped_jetpack_feature_text_10">Solucionar un problema de seguridad</string>
18+
<string name="login_prologue_revamped_jetpack_feature_text_9">Comparte el contenido en redes sociales</string>
1719
<string name="login_prologue_revamped_jetpack_feature_text_8">Buscar plugins</string>
1820
<string name="login_prologue_revamped_jetpack_feature_text_7">Restaurar una copia de seguridad</string>
1921
<string name="login_prologue_revamped_jetpack_feature_text_6">Responder a comentarios</string>
@@ -23,15 +25,13 @@ Language: es
2325
<string name="login_prologue_revamped_jetpack_feature_text_2">Crear un sitio</string>
2426
<string name="login_prologue_revamped_jetpack_feature_text_1">Actualizar un plugin</string>
2527
<string name="login_prologue_revamped_content_description_jetpack_logo">Logotipo de Jetpack</string>
26-
<string name="login_prologue_revamped_jetpack_feature_text_14">Publicar una foto</string>
27-
<string name="login_prologue_revamped_jetpack_feature_text_9">Comparte el contenido en redes sociales</string>
2828
<string name="me_btn_about">Sobre Jetpack</string>
2929
<string name="sign_out_wpcom_confirm_with_no_changes">¿Cerrar sesión en Jetpack?</string>
3030
<string name="me_disconnect_from_wordpress_com">Salir de Jetpack</string>
3131
<string name="support_ticket_subject">Jetpack para Ayuda de Android</string>
3232
<string name="login_magic_links_sent_label">Consulta tu correo electrónico en este dispositivo y pulsa el enlace que encontrarás en el mensaje que has recibido de Jetpack.com.</string>
33+
<string name="continue_with_wpcom_no_signup">Continuar con WordPress.com</string>
3334
<string name="app_tagline">Seguridad y rendimiento del sitio en la palma de tu mano</string>
3435
<string name="post_signup_interstitial_title">Te damos la bienvenida a Jetpack</string>
3536
<string name="app_title">Jetpack para Android</string>
36-
<string name="continue_with_wpcom_no_signup">Continuar con WordPress.com</string>
3737
</resources>

WordPress/src/jetpack/res/values-he/strings.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,10 @@ Language: he_IL
1212
<string name="login_prologue_revamped_jetpack_feature_text_15">לכתוב מכל מקום</string>
1313
<string name="missing_splits_dialog_message">באפליקציה של Jetpack חסרים רכיבים חיוניים ועליך להתקין אותה מחדש מהחנות Google Play.</string>
1414
<string name="me_btn_share">לשתף את Jetpack עם חברים</string>
15+
<string name="login_prologue_revamped_jetpack_feature_text_14">לפרסם תמונה</string>
1516
<string name="login_prologue_revamped_jetpack_feature_text_11">לפרסם תמונה</string>
1617
<string name="login_prologue_revamped_jetpack_feature_text_10">לתקן בעיית אבטחה</string>
18+
<string name="login_prologue_revamped_jetpack_feature_text_9">לשתף ברשתות החברתיות</string>
1719
<string name="login_prologue_revamped_jetpack_feature_text_8">לחפש תוספים</string>
1820
<string name="login_prologue_revamped_jetpack_feature_text_7">לשחזר גיבוי</string>
1921
<string name="login_prologue_revamped_jetpack_feature_text_6">לענות לתגובות</string>
@@ -23,15 +25,13 @@ Language: he_IL
2325
<string name="login_prologue_revamped_jetpack_feature_text_2">לבנות אתר</string>
2426
<string name="login_prologue_revamped_jetpack_feature_text_1">יש לעדכן תוסף </string>
2527
<string name="login_prologue_revamped_content_description_jetpack_logo">הלוגו של Jetpack</string>
26-
<string name="login_prologue_revamped_jetpack_feature_text_14">לפרסם תמונה</string>
27-
<string name="login_prologue_revamped_jetpack_feature_text_9">לשתף ברשתות החברתיות</string>
2828
<string name="me_btn_about">אודות Jetpack</string>
2929
<string name="sign_out_wpcom_confirm_with_no_changes">האם להתנתק מ-Jetpack?</string>
3030
<string name="me_disconnect_from_wordpress_com">להתנתק מ-Jetpack</string>
3131
<string name="support_ticket_subject">תמיכה ב-Jetpack ל-Android</string>
3232
<string name="login_magic_links_sent_label">עליך לבדוק את האימייל ממכשיר זה ולהקיש על הקישור בהודעה שקיבלת מ-Jetpack.com.</string>
33+
<string name="continue_with_wpcom_no_signup">להמשיך עם WordPress.com</string>
3334
<string name="app_tagline">האבטחה והביצועים של האתר ישירות מהמכשיר הנייד</string>
3435
<string name="post_signup_interstitial_title">ברוך בואך אל Jetpack</string>
3536
<string name="app_title">Jetpack ל-Android</string>
36-
<string name="continue_with_wpcom_no_signup">להמשיך עם WordPress.com</string>
3737
</resources>

WordPress/src/jetpack/res/values-it/strings.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,10 @@ Language: it
1212
<string name="login_prologue_revamped_jetpack_feature_text_15">Scrivi da ovunque</string>
1313
<string name="missing_splits_dialog_message">All\'app Jetpack mancano alcuni componenti richiesti ed è necessario reinstallarla da Google Play Store.</string>
1414
<string name="me_btn_share">Condividi Jetpack con un amico</string>
15+
<string name="login_prologue_revamped_jetpack_feature_text_14">Pubblica una foto</string>
1516
<string name="login_prologue_revamped_jetpack_feature_text_11">Pubblica una foto</string>
1617
<string name="login_prologue_revamped_jetpack_feature_text_10">Risolvi un problema di sicurezza</string>
18+
<string name="login_prologue_revamped_jetpack_feature_text_9">Condividi sui social</string>
1719
<string name="login_prologue_revamped_jetpack_feature_text_8">Cerca i plugin</string>
1820
<string name="login_prologue_revamped_jetpack_feature_text_7">Ripristina un backup</string>
1921
<string name="login_prologue_revamped_jetpack_feature_text_6">Rispondi ai commenti</string>
@@ -23,15 +25,13 @@ Language: it
2325
<string name="login_prologue_revamped_jetpack_feature_text_2">Crea un sito</string>
2426
<string name="login_prologue_revamped_jetpack_feature_text_1">Aggiorna un plugin</string>
2527
<string name="login_prologue_revamped_content_description_jetpack_logo">Logo Jetpack</string>
26-
<string name="login_prologue_revamped_jetpack_feature_text_14">Pubblica una foto</string>
27-
<string name="login_prologue_revamped_jetpack_feature_text_9">Condividi sui social</string>
2828
<string name="me_btn_about">Informazioni su Jetpack</string>
2929
<string name="sign_out_wpcom_confirm_with_no_changes">Uscire da Jetpack?</string>
3030
<string name="me_disconnect_from_wordpress_com">Esci da Jetpack</string>
3131
<string name="support_ticket_subject">Supporto Jetpack per Android</string>
3232
<string name="login_magic_links_sent_label">Controlla la tua e-mail su questo dispositivo e tocca il link nell\'e-mail ricevuta da Jetpack.com.</string>
33+
<string name="continue_with_wpcom_no_signup">Continua con WordPress.com</string>
3334
<string name="app_tagline">Sicurezza e prestazioni del sito dalla tua tasca</string>
3435
<string name="post_signup_interstitial_title">Sei su Jetpack</string>
3536
<string name="app_title">Jetpack per Android</string>
36-
<string name="continue_with_wpcom_no_signup">Continua con WordPress.com</string>
3737
</resources>

WordPress/src/jetpack/res/values-ja/strings.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,10 @@ Language: ja_JP
1212
<string name="login_prologue_revamped_jetpack_feature_text_15">どこでも執筆</string>
1313
<string name="missing_splits_dialog_message">Jetpack のアプリには必要なコンポーネントがないため、Google Play ストアから再インストールする必要があります。</string>
1414
<string name="me_btn_share">Jetpack を友達とシェア</string>
15+
<string name="login_prologue_revamped_jetpack_feature_text_14">写真を投稿</string>
1516
<string name="login_prologue_revamped_jetpack_feature_text_11">写真を投稿</string>
1617
<string name="login_prologue_revamped_jetpack_feature_text_10">セキュリティの問題を修正</string>
18+
<string name="login_prologue_revamped_jetpack_feature_text_9">ソーシャルメディアで共有</string>
1719
<string name="login_prologue_revamped_jetpack_feature_text_8">プラグインを検索</string>
1820
<string name="login_prologue_revamped_jetpack_feature_text_7">バックアップから復元</string>
1921
<string name="login_prologue_revamped_jetpack_feature_text_6">コメントに返信</string>
@@ -23,15 +25,13 @@ Language: ja_JP
2325
<string name="login_prologue_revamped_jetpack_feature_text_2">サイトを構築</string>
2426
<string name="login_prologue_revamped_jetpack_feature_text_1">プラグインを更新</string>
2527
<string name="login_prologue_revamped_content_description_jetpack_logo">Jetpack のロゴ</string>
26-
<string name="login_prologue_revamped_jetpack_feature_text_14">写真を投稿</string>
27-
<string name="login_prologue_revamped_jetpack_feature_text_9">ソーシャルメディアで共有</string>
2828
<string name="me_btn_about">Jetpack について</string>
2929
<string name="sign_out_wpcom_confirm_with_no_changes">Jetpack からログアウトしますか ?</string>
3030
<string name="me_disconnect_from_wordpress_com">Jetpack からログアウト</string>
3131
<string name="support_ticket_subject">Android サポート版 Jetpack</string>
3232
<string name="login_magic_links_sent_label">この端末でメールを確認して、Jetpack.com から届いたメールに記載されているリンクをタップしてください。</string>
33+
<string name="continue_with_wpcom_no_signup">WordPress.com で続ける</string>
3334
<string name="app_tagline">サイトのセキュリティとパフォーマンスをポケットの中に</string>
3435
<string name="post_signup_interstitial_title">Jetpack へようこそ</string>
3536
<string name="app_title">Android 版 Jetpack</string>
36-
<string name="continue_with_wpcom_no_signup">WordPress.com で続ける</string>
3737
</resources>

WordPress/src/jetpack/res/values-ko/strings.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,10 @@ Language: ko_KR
1212
<string name="login_prologue_revamped_jetpack_feature_text_15">어디서나 작성</string>
1313
<string name="missing_splits_dialog_message">필수 구성 요소가 젯팩 앱에 없습니다. Google Play 스토어에서 다시 설치해야 합니다.</string>
1414
<string name="me_btn_share">친구와 젯팩 공유</string>
15+
<string name="login_prologue_revamped_jetpack_feature_text_14">사진 게시</string>
16+
<string name="login_prologue_revamped_jetpack_feature_text_11">사진 게시</string>
1517
<string name="login_prologue_revamped_jetpack_feature_text_10">보안 문제 해결</string>
18+
<string name="login_prologue_revamped_jetpack_feature_text_9">소셜에서 공유</string>
1619
<string name="login_prologue_revamped_jetpack_feature_text_8">플러그인 검색</string>
1720
<string name="login_prologue_revamped_jetpack_feature_text_7">백업 복원</string>
1821
<string name="login_prologue_revamped_jetpack_feature_text_6">댓글 응답</string>
@@ -22,16 +25,13 @@ Language: ko_KR
2225
<string name="login_prologue_revamped_jetpack_feature_text_2">사이트 구축</string>
2326
<string name="login_prologue_revamped_jetpack_feature_text_1">플러그인 업데이트</string>
2427
<string name="login_prologue_revamped_content_description_jetpack_logo">젯팩 로고</string>
25-
<string name="login_prologue_revamped_jetpack_feature_text_11">사진 게시</string>
26-
<string name="login_prologue_revamped_jetpack_feature_text_14">사진 게시</string>
27-
<string name="login_prologue_revamped_jetpack_feature_text_9">소셜에서 공유</string>
2828
<string name="me_btn_about">젯팩 정보</string>
2929
<string name="sign_out_wpcom_confirm_with_no_changes">젯팩에서 로그아웃하시나요?</string>
3030
<string name="me_disconnect_from_wordpress_com">젯팩에서 로그아웃하시나요?</string>
3131
<string name="support_ticket_subject">Android 지원용 젯팩</string>
3232
<string name="login_magic_links_sent_label">이 기기에서 이메일을 확인하여 젯팩닷컴에서 받은 이메일 내 링크를 누르세요.</string>
33+
<string name="continue_with_wpcom_no_signup">워드프레스닷컴 계속</string>
3334
<string name="app_tagline">어디서나 간편하게 사이트 보안 및 성능</string>
3435
<string name="post_signup_interstitial_title">젯팩에 오신 것을 환영합니다!</string>
3536
<string name="app_title">Android용 젯팩</string>
36-
<string name="continue_with_wpcom_no_signup">워드프레스닷컴 계속</string>
3737
</resources>

WordPress/src/jetpack/res/values-nl/strings.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,10 @@ Language: nl
1212
<string name="login_prologue_revamped_jetpack_feature_text_15">Schrijven vanaf elke locatie</string>
1313
<string name="missing_splits_dialog_message">Er ontbreken vereiste onderdelen in de Jetpack-app en deze moeten opnieuw worden geïnstalleerd vanuit de Google Play Store.</string>
1414
<string name="me_btn_share">Deel Jetpack met een vriend</string>
15+
<string name="login_prologue_revamped_jetpack_feature_text_14">Foto\'s plaatsen</string>
1516
<string name="login_prologue_revamped_jetpack_feature_text_11">Een foto plaatsen</string>
1617
<string name="login_prologue_revamped_jetpack_feature_text_10">Een beveiligingsprobleem oplossen</string>
18+
<string name="login_prologue_revamped_jetpack_feature_text_9">Delen op social media</string>
1719
<string name="login_prologue_revamped_jetpack_feature_text_8">Plugins zoeken</string>
1820
<string name="login_prologue_revamped_jetpack_feature_text_7">Een back-up terugzetten</string>
1921
<string name="login_prologue_revamped_jetpack_feature_text_6">Op reacties reageren</string>
@@ -23,15 +25,13 @@ Language: nl
2325
<string name="login_prologue_revamped_jetpack_feature_text_2">Een website bouwen</string>
2426
<string name="login_prologue_revamped_jetpack_feature_text_1">Een plugin bijwerken</string>
2527
<string name="login_prologue_revamped_content_description_jetpack_logo">Jetpack-logo</string>
26-
<string name="login_prologue_revamped_jetpack_feature_text_14">Foto\'s plaatsen</string>
27-
<string name="login_prologue_revamped_jetpack_feature_text_9">Delen op social media</string>
2828
<string name="me_btn_about">Over Jetpack</string>
2929
<string name="sign_out_wpcom_confirm_with_no_changes">Uitloggen bij Jetpack?</string>
3030
<string name="me_disconnect_from_wordpress_com">Uitloggen bij Jetpack</string>
31+
<string name="support_ticket_subject">Jetpack voor Android Support</string>
3132
<string name="login_magic_links_sent_label">Controleer je e-mail op dit apparaat en tik op de link in de e-mail die je van Jetpack.com hebt ontvangen.</string>
33+
<string name="continue_with_wpcom_no_signup">Doorgaan met WordPress.com</string>
3234
<string name="app_tagline">Veiligheid en prestaties van de site vanuit je broekzak</string>
3335
<string name="post_signup_interstitial_title">Welkom bij Jetpack</string>
3436
<string name="app_title">Jetpack voor Android</string>
35-
<string name="support_ticket_subject">Jetpack voor Android Support</string>
36-
<string name="continue_with_wpcom_no_signup">Doorgaan met WordPress.com</string>
3737
</resources>

WordPress/src/jetpack/res/values-pt-rBR/strings.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,10 @@ Language: pt_BR
1212
<string name="login_prologue_revamped_jetpack_feature_text_15">Escreva de onde estiver</string>
1313
<string name="missing_splits_dialog_message">Estão faltando componentes obrigatórios no app Jetpack. É necessário fazer a reinstalação pela Google Play Store.</string>
1414
<string name="me_btn_share">Compartilhe o Jetpack com amigos</string>
15+
<string name="login_prologue_revamped_jetpack_feature_text_14">Publique uma foto</string>
1516
<string name="login_prologue_revamped_jetpack_feature_text_11">Publicar uma foto</string>
1617
<string name="login_prologue_revamped_jetpack_feature_text_10">Corrigir um problema de segurança</string>
18+
<string name="login_prologue_revamped_jetpack_feature_text_9">Compartilhe nas redes sociais</string>
1719
<string name="login_prologue_revamped_jetpack_feature_text_8">Pesquisar plugins</string>
1820
<string name="login_prologue_revamped_jetpack_feature_text_7">Restaurar um backup</string>
1921
<string name="login_prologue_revamped_jetpack_feature_text_6">Responder a comentários</string>
@@ -23,15 +25,13 @@ Language: pt_BR
2325
<string name="login_prologue_revamped_jetpack_feature_text_2">Criar um site</string>
2426
<string name="login_prologue_revamped_jetpack_feature_text_1">Atualizar um plugin</string>
2527
<string name="login_prologue_revamped_content_description_jetpack_logo">Logotipo do Jetpack</string>
26-
<string name="login_prologue_revamped_jetpack_feature_text_14">Publique uma foto</string>
27-
<string name="login_prologue_revamped_jetpack_feature_text_9">Compartilhe nas redes sociais</string>
2828
<string name="me_btn_about">Sobre o Jetpack</string>
2929
<string name="sign_out_wpcom_confirm_with_no_changes">Fazer logout do Jetpack?</string>
3030
<string name="me_disconnect_from_wordpress_com">Fazer logout do Jetpack</string>
3131
<string name="support_ticket_subject">Suporte ao Jetpack para Android</string>
3232
<string name="login_magic_links_sent_label">Verifique seu e-mail neste dispositivo e toque no link que você recebeu por e-mail do Jetpack.com.</string>
33+
<string name="continue_with_wpcom_no_signup">Continuar com o WordPress.com</string>
3334
<string name="app_tagline">Segurança e desempenho do site no seu bolso</string>
3435
<string name="post_signup_interstitial_title">Desejamos boas-vindas ao Jetpack</string>
3536
<string name="app_title">Jetpack para Android</string>
36-
<string name="continue_with_wpcom_no_signup">Continuar com o WordPress.com</string>
3737
</resources>

0 commit comments

Comments
 (0)