feat: use a pref to control whether to enable exit app confirmation

InfinityLoop1308 · InfinityLoop1308 · commit ae8caad40aae · 2025-06-21T06:40:59.000+08:00
diff --git a/app/src/main/java/org/schabi/newpipe/MainActivity.java b/app/src/main/java/org/schabi/newpipe/MainActivity.java
@@ -678,11 +678,13 @@ public void onBackPressed() {
             }
         }
 
+        final SharedPreferences pref = PreferenceManager.getDefaultSharedPreferences(this);
+
         // Show toast and exit logic only when we're about to exit the app
-        if (getSupportFragmentManager().getBackStackEntryCount() == 1) {
+        if (getSupportFragmentManager().getBackStackEntryCount() == 1 ) {
             long currentTime = System.currentTimeMillis();
 
-            if (currentTime - lastBackPressTime < BACK_PRESS_TIMEOUT) {
+            if (!pref.getBoolean(getString(R.string.exit_app_confirmation_key), true) || currentTime - lastBackPressTime < BACK_PRESS_TIMEOUT) {
                 // Second back press within timeout - exit the app
                 finish();
                 return;
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
@@ -975,4 +975,6 @@
 <string name="feed_groups_grid_layout_summary">Auf der Abonnementseite werden Kanalgruppen in einem Raster anstelle eines horizontalen Bildlaufs angezeigt</string>
 <string name="press_back_again_to_exit">Drücken Sie erneut zurück, um zu beenden</string>
 <string name="need_login_hint"> Dieser Inhalt erfordert ein Konto, um angezeigt zu werden. Melden Sie sich über die Einstellungen an, um fortzufahren.</string>
+<string name="exit_app_confirmation_message">Zeigen Sie einen "Drücken Sie erneut zurück, um zu beenden" Toast, um versehentliches Beenden zu vermeiden</string>
+<string name="exit_app_confirmation_title">Bestätigung zum Beenden der App</string>
 </resources>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
@@ -1038,4 +1038,6 @@
 <string name="feed_groups_grid_layout_summary">En la página de Suscripciones, mostrar grupos de canales en una cuadrícula en lugar de desplazamiento horizontal</string>
 <string name="press_back_again_to_exit">Presiona atrás nuevamente para salir</string>
 <string name="need_login_hint"> Este contenido requiere una cuenta para ver. Inicia sesión a través de la configuración para continuar.</string>
+<string name="exit_app_confirmation_message">Mostrar un toast de "presiona atrás de nuevo para salir" para evitar salir accidentalmente</string>
+<string name="exit_app_confirmation_title">Confirmación de salida de la aplicación</string>
 </resources>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
@@ -928,4 +928,6 @@ Vous devez l\'accepter pour nous envoyer le rapport de bug.</string>
 <string name="feed_groups_grid_layout_summary">Dans la page des abonnements, afficher les groupes de chaînes dans une grille au lieu d\'un défilement horizontal</string>
 <string name="press_back_again_to_exit">Appuyez à nouveau sur retour pour quitter</string>
 <string name="need_login_hint"> Ce contenu nécessite un compte pour être consulté. Connectez-vous via les paramètres pour continuer.</string>
+<string name="exit_app_confirmation_message">Afficher un toast "appuyez à nouveau sur retour pour quitter" pour éviter de quitter accidentellement</string>
+<string name="exit_app_confirmation_title">Confirmation de sortie de l\'application</string>
 </resources>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
@@ -895,4 +895,6 @@
 <string name="feed_groups_grid_layout_summary">Nella pagina delle iscrizioni, mostra i gruppi di canali in una griglia invece di scorrere orizzontalmente</string>
 <string name="press_back_again_to_exit">Premi di nuovo indietro per uscire</string>
 <string name="need_login_hint"> Questo contenuto richiede un account per essere visualizzato. Accedi tramite le impostazioni per continuare.</string>
+<string name="exit_app_confirmation_message">Mostra un toast "premi di nuovo indietro per uscire" per evitare uscite accidentali</string>
+<string name="exit_app_confirmation_title">Conferma uscita dall\'app</string>
 </resources>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
@@ -991,4 +991,6 @@
 <string name="feed_groups_grid_layout_summary">サブスクリプションページで、チャンネルグループを水平スクロールの代わりにグリッドで表示する</string>
 <string name="press_back_again_to_exit">もう一度戻るボタンを押して終了します</string>
 <string name="need_login_hint"> このコンテンツを表示するにはアカウントが必要です。設定からログインして続行してください。</string>
+<string name="exit_app_confirmation_message">「もう一度戻るボタンを押すと終了します」というトーストを表示して、誤って終了するのを防ぎます</string>
+<string name="exit_app_confirmation_title">アプリ終了の確認</string>
 </resources>
diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
@@ -1081,4 +1081,6 @@ nSự khác biệt giữa hai loại này là cái nào nhanh thường thiếu
 <string name="feed_groups_grid_layout_summary">Trong trang Đăng ký, hiển thị các nhóm kênh dưới dạng lưới thay vì cuộn ngang</string>
 <string name="press_back_again_to_exit">Nhấn quay lại lần nữa để thoát</string>
 <string name="need_login_hint"> Nội dung này yêu cầu tài khoản để xem. Đăng nhập qua cài đặt để tiếp tục.</string>
+<string name="exit_app_confirmation_message">Hiển thị thông báo "nhấn quay lại lần nữa để thoát" để tránh thoát nhầm</string>
+<string name="exit_app_confirmation_title">Xác nhận thoát ứng dụng</string>
 </resources>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
@@ -1037,4 +1037,6 @@
 <string name="feed_groups_grid_layout_summary">在订阅页面中，将频道组显示为网格而不是水平滚动</string>
 <string name="press_back_again_to_exit">再次按返回键退出</string>
 <string name="need_login_hint"> 此内容需要账户才能查看。通过设置登录以继续。</string>
+<string name="exit_app_confirmation_message">显示“再次按返回键退出”提示以避免意外退出</string>
+<string name="exit_app_confirmation_title">退出应用确认</string>
 </resources>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
@@ -1029,4 +1029,6 @@
 <string name="feed_groups_grid_layout_summary">在訂閱頁面中，將頻道群組顯示為網格而不是水平滾動</string>
 <string name="press_back_again_to_exit">再次按返回键以退出</string>
 <string name="need_login_hint"> 此內容需要帳戶才能查看。通過設置登錄以繼續。</string>
+<string name="exit_app_confirmation_message">顯示“再次按返回退出”的提示，以避免意外退出</string>
+<string name="exit_app_confirmation_title">退出應用程式確認</string>
 </resources>
diff --git a/app/src/main/res/values/settings_keys.xml b/app/src/main/res/values/settings_keys.xml
@@ -1653,6 +1653,7 @@
     <string name="auto_ellipsize_key">auto_ellipsize_key</string>
     <string name="enable_max_rows_customization_key">enable_max_rows_customization_key</string>
     <string name="always_list_mode_for_bookmark_key">always_list_mode_for_bookmark_key</string>
+    <string name="exit_app_confirmation_key">exit_app_confirmation_key</string>
     <string-array name="filter_type_entries">
         <item>@string/search_result</item>
         <item>@string/recommended_videos</item>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -1079,4 +1079,6 @@
 <string name="feed_groups_grid_layout_title">Use grid layout for channel group list</string>
 <string name="feed_groups_grid_layout_summary">In the Subscriptions page, show channel groups in a grid instead of horizontal scroll</string>
 <string name="need_login_hint"> This content requires an account to view. Login through settings to continue.</string>
+<string name="exit_app_confirmation_message">Show a "press back again to quit" toast to avoid accidental quiting</string>
+<string name="exit_app_confirmation_title">Exit app confirmation</string>
 </resources>
diff --git a/app/src/main/res/xml/behavior_settings.xml b/app/src/main/res/xml/behavior_settings.xml
@@ -92,6 +92,15 @@
             android:title="@string/clear_queue_confirmation_title"
             app:singleLineTitle="false"
             app:iconSpaceReserved="false" />
+
+    <SwitchPreferenceCompat
+            android:defaultValue="true"
+            android:key="@string/exit_app_confirmation_key"
+            android:title="@string/exit_app_confirmation_title"
+            android:summary="@string/exit_app_confirmation_message"
+            app:singleLineTitle="false"
+            app:iconSpaceReserved="false" />
+
     <SwitchPreferenceCompat
             android:defaultValue="false"
             android:key="@string/comments_inner_scroll_key"
diff --git a/translator.py b/translator.py
@@ -340,35 +340,14 @@ def update_translations_from_xml(self, input_xml_path, language):
             print(f"Error updating translations: {str(e)}")
             return False
 
-    def update_with_replace(self, name, new_value=None):
+    def update_with_replace(self, name, new_value):
         """
         Update an existing entry with a new value and translate it to all target languages.
 
         Parameters:
         name (str): The name of the string entry to update
         new_value (str): The new value to set for the entry. If None, will prompt user via editor.
         """
-        # If new_value is not provided, get it from the user via editor
-        if new_value is None:
-            # Try to get the current value to show as initial content
-            try:
-                current_strings = self.base.load_strings_to_dict()
-                initial_content = current_strings.get(name, "")
-            except:
-                initial_content = ""
-
-            print(f"Opening editor to input new value for '{name}'...")
-            print("Current value will be shown as initial content. Save and exit to confirm.")
-
-            new_value = get_user_input_from_vim(initial_content)
-
-            if new_value is None:
-                print("Update cancelled.")
-                return
-
-            if not new_value.strip():
-                print("Empty value provided. Update cancelled.")
-                return
 
         # Update the base XML with the new value
         try:
@@ -403,14 +382,32 @@ def translate_and_update_target(target):
 
         print(f"Successfully updated and translated '{name}' to all target languages.")
 
+def get_value_from_vim():
+    # If new_value is not provided, get it from the user via editor
+        # Try to get the current value to show as initial content
+    try:
+        current_strings = self.base.load_strings_to_dict()
+        initial_content = current_strings.get(name, "")
+    except:
+        initial_content = ""
+
+    print(f"Opening editor to input new value for '{name}'...")
+    print("Current value will be shown as initial content. Save and exit to confirm.")
+
+    return get_user_input_from_vim(initial_content)
+
+
 
 if __name__ == '__main__':
     translator = StringTranslator()
     # translator.update_translations_from_xml('tmp.xml', 'ja')
     # read params
     args = sys.argv
     if args[1] == 'add':
-        translator.add_new_entry(args[2], args[3])
+        if args[-1] == '-i':
+            translator.add_new_entry(args[2], get_user_input_from_vim())
+        else:
+            translator.add_new_entry(args[2], args[3])
     elif args[1] == 'delete' or args[1] == 'remove':
         translator.delete_entry(args[2])
     elif args[1] == 'update_multi':
@@ -425,7 +422,7 @@ def translate_and_update_target(target):
         if len(args) == 3:
             translator.translate_item_updates_to_all(args[2:])
         elif args[-1] == "-i":
-            translator.update_with_replace(args[2])
+            translator.update_with_replace(args[2], get_user_input_from_vim())
         elif len(args) == 4:
             translator.update_with_replace(args[2], args[3])
 

Original file line number	Diff line number	Diff line change
`@@ -678,11 +678,13 @@ public void onBackPressed() {`
`678`	`678`	`}`
`679`	`679`	`}`
`680`	`680`
	`681`	`+ final SharedPreferences pref = PreferenceManager.getDefaultSharedPreferences(this);`
	`682`	`+`
`681`	`683`	`// Show toast and exit logic only when we're about to exit the app`
`682`		`- if (getSupportFragmentManager().getBackStackEntryCount() == 1) {`
	`684`	`+ if (getSupportFragmentManager().getBackStackEntryCount() == 1 ) {`
`683`	`685`	`long currentTime = System.currentTimeMillis();`
`684`	`686`
`685`		`- if (currentTime - lastBackPressTime < BACK_PRESS_TIMEOUT) {`
	`687`	`+ if (!pref.getBoolean(getString(R.string.exit_app_confirmation_key), true) \|\| currentTime - lastBackPressTime < BACK_PRESS_TIMEOUT) {`
`686`	`688`	`// Second back press within timeout - exit the app`
`687`	`689`	`finish();`
`688`	`690`	`return;`