Support private tabs for FireFox (#1216)

* Support private tabs for FireFox Extra read here: https://github.com/mozilla-mobile/firefox-android/blob/fenix-v117.0/fenix/app/src/main/java/org/mozilla/fenix/IntentReceiverActivity.kt#L65 Key defined here: https://github.com/mozilla-mobile/firefox-android/blob/fenix-v117.0/fenix/app/src/main/java/org/mozilla/fenix/HomeActivity.kt#L1290 * Use private tabs even if not custom * Delete obsolete string values --------- Co-authored-by: Maarten Vercruysse <[email protected]> Co-authored-by: Dessalines <[email protected]>
LemmyNet · Sep 4, 2023 · 86674b9 · 86674b9
1 parent b0dbdef
commit 86674b9
Show file tree

Hide file tree

Showing 15 changed files with 11 additions and 20 deletions.
diff --git a/app/src/main/java/com/jerboa/Utils.kt b/app/src/main/java/com/jerboa/Utils.kt
@@ -394,16 +394,20 @@ suspend fun openLink(url: String, navController: NavController, useCustomTab: Bo
 }
 
 fun openLinkRaw(url: String, navController: NavController, useCustomTab: Boolean, usePrivateTab: Boolean) {
+    val extras = Intent().apply {
+        if (usePrivateTab) {
+            putExtra("com.google.android.apps.chrome.EXTRA_OPEN_NEW_INCOGNITO_TAB", true)
+            putExtra("private_browsing_mode", true)
+        }
+    }
+
     if (useCustomTab) {
-        val intent = CustomTabsIntent.Builder()
-            .build().apply {
-                if (usePrivateTab) {
-                    intent.putExtra("com.google.android.apps.chrome.EXTRA_OPEN_NEW_INCOGNITO_TAB", true)
-                }
-            }
+        val intent = CustomTabsIntent.Builder().build()
+        intent.intent.putExtras(extras)
         intent.launchUrl(navController.context, Uri.parse(url))
     } else {
         val intent = Intent(Intent.ACTION_VIEW, Uri.parse(url))
+        intent.putExtras(extras)
         navController.context.startActivitySafe(intent)
     }
 }

diff --git a/app/src/main/res/values-az/strings.xml b/app/src/main/res/values-az/strings.xml
@@ -199,7 +199,6 @@
     <string name="look_and_feel_theme_color_purple">Bənövşəyi</string>
     <string name="look_and_feel_theme_color_woodland">Meşəlik</string>
     <string name="look_and_feel_use_custom_tabs">Şəxsi panellərdən istifadə et</string>
-    <string name="look_and_feel_use_private_tabs">Mümkünsə, ayrı fərdi panellərdən istifadə et</string>
     <string name="markRead">Oxunan kimi işarələ</string>
     <string name="markUnread">Oxunmamış kimi işarələ</string>
     <string name="markdownHelper_formatBold">Qalın mətn kimi formatla</string>

diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
@@ -266,7 +266,6 @@
     <string name="bottomBar_label_profile">Profil</string>
     <string name="look_and_feel_show_action_bar_for_comments">Aktionsleiste standardmäsig bei Kommentaren anzeigen</string>
     <string name="look_and_feel_show_voting_arrows_list_view">Bewertungspfeile in Listenansicht anzeigen</string>
-    <string name="look_and_feel_use_private_tabs">Private angepasste Tabs nutzen falls verfügbar</string>
     <string name="upvote">Hochstimmen</string>
     <string name="downvote">Runterstimmen</string>
     <string name="upvoted">Hochgestimmt</string>

diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
@@ -194,7 +194,6 @@
     <string name="look_and_feel_theme_color_purple">Μωβ</string>
     <string name="look_and_feel_theme_color_woodland">Δασώδες</string>
     <string name="look_and_feel_use_custom_tabs">Χρήση εξατομικευμένων καρτελών</string>
-    <string name="look_and_feel_use_private_tabs">Χρήση ιδιωτικών εξατομικευμένων καρτελών εάν είναι διαθέσιμες</string>
     <string name="markRead">Σήμανση ως αναγνωσμένο</string>
     <string name="markUnread">Σήμανση ως μη αναγνωσμένο</string>
     <string name="markdownHelper_formatBold">Μορφοποίηση ως έντονο κείμενο</string>

diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
@@ -183,7 +183,6 @@
     <string name="look_and_feel_post_view_list">Lista</string>
     <string name="look_and_feel_show_navigation_bar">Mostrar barra de navegación</string>
     <string name="look_and_feel_use_custom_tabs">Usar pestañas personalizadas</string>
-    <string name="look_and_feel_use_private_tabs">Usar pestañas privadas personalizadas si están disponible</string>
     <string name="settings_activity_settings">Ajustes</string>
     <string name="settings_activity_look_and_feel">Tema y aspecto</string>
     <string name="settings_activity_account_settings">ajustes de %1$s</string>

diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
@@ -264,7 +264,6 @@
     <string name="dialogs_old">Anciens</string>
     <string name="look_and_feel_show_action_bar_for_comments">Afficher la barre d’action par défaut pour les commentaires</string>
     <string name="look_and_feel_show_voting_arrows_list_view">Montrer les flèches de vote dans la vue en liste</string>
-    <string name="look_and_feel_use_private_tabs">Utiliser les onglets privés personnalisés si disponible</string>
     <string name="upvote">Plusser</string>
     <string name="downvote">Moinser</string>
     <string name="upvoted">Plussé</string>

diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
@@ -194,7 +194,6 @@
     <string name="look_and_feel_theme_color_purple">Viola</string>
     <string name="look_and_feel_theme_color_woodland">Bosco</string>
     <string name="look_and_feel_use_custom_tabs">Usa schede personalizzate</string>
-    <string name="look_and_feel_use_private_tabs">Usa schede personalizzate private se disponibili</string>
     <string name="markRead">Segna come letto</string>
     <string name="markUnread">Segna come non letto</string>
     <string name="markdownHelper_formatBold">Formatta in grassetto</string>

diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
@@ -167,7 +167,6 @@
     <string name="look_and_feel_post_view_list">リスト</string>
     <string name="look_and_feel_show_navigation_bar">ナビゲーションバーを表示</string>
     <string name="look_and_feel_use_custom_tabs">カスタムタブを使う</string>
-    <string name="look_and_feel_use_private_tabs">私的カスタムタブを使う</string>
     <string name="settings_activity_settings">設定</string>
     <string name="settings_activity_look_and_feel">外見設定</string>
     <string name="settings_activity_account_settings">%1$s 設定</string>

diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
@@ -199,7 +199,6 @@
     <string name="look_and_feel_theme_color_purple">보라색</string>
     <string name="look_and_feel_theme_color_woodland">우드랜드</string>
     <string name="look_and_feel_use_custom_tabs">커스텀 탭 사용</string>
-    <string name="look_and_feel_use_private_tabs">가능하면 개인 커스텀 탭 이용하기</string>
     <string name="markRead">읽음으로 처리</string>
     <string name="markUnread">안읽음으로 처리</string>
     <string name="markdownHelper_formatBold">볼드로 표시</string>

diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
@@ -227,7 +227,6 @@
     <string name="post_listing_permalink_copied">Permalink gekopieerd</string>
     <string name="comment_node_block">%1$s blokkeren</string>
     <string name="comment_reply_node_copy_permalink">Permalink kopiëren</string>
-    <string name="look_and_feel_use_private_tabs">Gebruik indien beschikbaar aangepaste privé tabbladen</string>
     <string name="markRead">Markeer als gelezen</string>
     <string name="markUnread">Markeer als niet gelezen</string>
     <string name="markdownHelper_formatBold">Opmaak als vette text</string>

diff --git a/app/src/main/res/values-nn/strings.xml b/app/src/main/res/values-nn/strings.xml
@@ -201,7 +201,6 @@
   <string name="look_and_feel_theme_color_purple">Purpur</string>
   <string name="look_and_feel_theme_color_woodland">Trevirke</string>
   <string name="look_and_feel_use_custom_tabs">Opna lenkjer inni programmet</string>
-  <string name="look_and_feel_use_private_tabs">Bruk privatvising av lenkjer viss tilgjengeleg</string>
   <string name="markRead">Merk som lesen</string>
   <string name="markUnread">Merk som ulesen</string>
   <string name="markdownHelper_formatBold">Formater som halvfeit tekst</string>

diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
@@ -167,7 +167,6 @@
     <string name="look_and_feel_post_view_list">Lista</string>
     <string name="look_and_feel_show_navigation_bar">Pokaż pasek nawigacji</string>
     <string name="look_and_feel_use_custom_tabs">Używaj niestandardowych kart</string>
-    <string name="look_and_feel_use_private_tabs">Używaj prywatnych niestandardowych kart jeśli są dostępne</string>
     <string name="settings_activity_settings">Ustawienia</string>
     <string name="settings_activity_look_and_feel">Wygląd i preferencje</string>
     <string name="settings_activity_account_settings">Ustawienia %1$s</string>

diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
@@ -121,7 +121,6 @@
     <string name="look_and_feel_theme_color_purple">Фиолетовая</string>
     <string name="look_and_feel_theme_color_woodland">Лесистая</string>
     <string name="look_and_feel_use_custom_tabs">Использовать нестандартные вкладки</string>
-    <string name="look_and_feel_use_private_tabs">Использовать приватные нестандартные вкладки, если это доступно</string>
     <string name="markRead">Отметить как прочитанное</string>
     <string name="markUnread">Отметить как непрочитанное</string>
     <string name="markdownHelper_formatBold">Форматировать жирным</string>

diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
@@ -196,7 +196,6 @@
     <string name="look_and_feel_theme_color_purple">Фіолетова</string>
     <string name="look_and_feel_theme_color_woodland">Рідколісся</string>
     <string name="look_and_feel_use_custom_tabs">Використовувати власні вкладки</string>
-    <string name="look_and_feel_use_private_tabs">Використовувати власні приватні вкладки, якщо вони доступні</string>
     <string name="markRead">Позначити як прочитане</string>
     <string name="markUnread">Позначити як непрочитане</string>
     <string name="markdownHelper_formatBold">Форматувати жирним шрифтом</string>

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -205,7 +205,7 @@
     <string name="look_and_feel_theme_color_purple">Purple</string>
     <string name="look_and_feel_theme_color_woodland">Woodland</string>
     <string name="look_and_feel_use_custom_tabs">Use custom tabs</string>
-    <string name="look_and_feel_use_private_tabs">Use private custom tabs if available</string>
+    <string name="look_and_feel_use_private_tabs">Use private tabs if available</string>
     <string name="markRead">Mark as read</string>
     <string name="markUnread">Mark as unread</string>
     <string name="markdownHelper_formatBold">Format as bold text</string>