Hackfix to facebook/react-native#42024 [DO NOT MERGE]

app.config.js

@@ -9,12 +9,12 @@ module.exports = function () {
   /**
    * iOS build number. Must be incremented for each TestFlight version.
    */
-  const IOS_BUILD_NUMBER = '2'
+  const IOS_BUILD_NUMBER = '1'
 
   /**
    * Android build number. Must be incremented for each release.
    */
-  const ANDROID_VERSION_CODE = 53
+  const ANDROID_VERSION_CODE = 54
 
   /**
    * Uses built-in Expo env vars

package.json

@@ -1,6 +1,6 @@
 {
   "name": "bsky.app",
-  "version": "1.62.0",
+  "version": "1.63.0",
   "private": true,
   "engines": {
     "node": ">=18"

plugins/withAndroidManifestPlugin.js

@@ -1,7 +1,7 @@
-const {withAndroidManifest} = require('expo/config-plugins')
+const {withAndroidManifest, withAppBuildGradle} = require('expo/config-plugins')
 
 module.exports = function withAndroidManifestPlugin(appConfig) {
-  return withAndroidManifest(appConfig, function (decoratedAppConfig) {
+  appConfig = withAndroidManifest(appConfig, function (decoratedAppConfig) {
     try {
       decoratedAppConfig.modResults.manifest.application[0].$[
         'android:largeHeap'
@@ -11,4 +11,23 @@ module.exports = function withAndroidManifestPlugin(appConfig) {
     }
     return decoratedAppConfig
   })
+
+  appConfig = withAppBuildGradle(appConfig, function (decoratedAppConfig) {
+    // HACK
+    // Workaround for https://github.com/facebook/react-native/issues/42024
+    // Remove when React Native resolves this issue
+    // -prf
+    const MATCH_STRING = 'defaultConfig {\n'
+    const str = decoratedAppConfig.modResults.contents
+    const index = str.indexOf(MATCH_STRING) + MATCH_STRING.length
+    decoratedAppConfig.modResults.contents = `${str.slice(
+      0,
+      index,
+    )}\nresConfigs "en", "hi", "ja", "fr", "ko", "pt", "uk"\n${str.slice(
+      index,
+    )}`
+    return decoratedAppConfig
+  })
+
+  return appConfig
 }

src/locale/locales/de/messages.po

@@ -144,7 +144,7 @@ msgstr "Passen Sie die Anzahl der Likes an, die eine Antwort haben muss, um in I
 msgid "Adult Content"
 msgstr "Inhalt für Erwachsene"
 
-#: src/view/screens/Settings.tsx:569
+#: src/view/screens/Settings.tsx:602
 msgid "Advanced"
 msgstr "Fortgeschrittene"
 
@@ -177,7 +177,7 @@ msgstr "und"
 msgid "App Language"
 msgstr "App Sprache"
 
-#: src/view/screens/Settings.tsx:589
+#: src/view/screens/Settings.tsx:622
 msgid "App passwords"
 msgstr "App-Passwörter"
 
@@ -328,7 +328,7 @@ msgstr "Bluesky wird dein Profil und deine Beiträge nicht für abgemeldete Benu
 msgid "Bluesky.Social"
 msgstr "Bluesky.Social"
 
-#: src/view/screens/Settings.tsx:718
+#: src/view/screens/Settings.tsx:751
 msgid "Build version {0} {1}"
 msgstr "Version bauen {0} {1}"
 
@@ -403,8 +403,8 @@ msgstr "Anmeldung zur Warteliste abbrechen"
 msgid "Change"
 msgstr "Ändern"
 
-#: src/view/screens/Settings.tsx:601
-#: src/view/screens/Settings.tsx:610
+#: src/view/screens/Settings.tsx:634
+#: src/view/screens/Settings.tsx:643
 msgid "Change handle"
 msgstr "Änderungsgriff andern"
 
@@ -448,19 +448,19 @@ msgstr "Wählen Sie die Algorithmen, die Ihr Erlebnis mit benutzerdefinierten Fe
 msgid "Choose your password"
 msgstr "Wählen Sie Ihr Passwort"
 
-#: src/view/screens/Settings.tsx:694
+#: src/view/screens/Settings.tsx:727
 msgid "Clear all legacy storage data"
 msgstr "Alle alten Speicherdaten löschen"
 
-#: src/view/screens/Settings.tsx:696
+#: src/view/screens/Settings.tsx:729
 msgid "Clear all legacy storage data (restart after this)"
 msgstr "Alle alten Speicherdaten löschen (danach neu starten)"
 
-#: src/view/screens/Settings.tsx:706
+#: src/view/screens/Settings.tsx:739
 msgid "Clear all storage data"
 msgstr "Alle alten Speicherdaten löschen"
 
-#: src/view/screens/Settings.tsx:708
+#: src/view/screens/Settings.tsx:741
 msgid "Clear all storage data (restart after this)"
 msgstr "Alle alten Speicherdaten löschen (danach neu starten)"
 
@@ -616,11 +616,15 @@ msgstr "Erstellt {0}"
 msgid "Custom domain"
 msgstr "Benutzerdefinierter Bereich"
 
-#: src/view/screens/Settings.tsx:615
+#: src/view/screens/PreferencesExternalEmbeds.tsx:55
+msgid "Customize media from external sites."
+msgstr ""
+
+#: src/view/screens/Settings.tsx:648
 msgid "Danger Zone"
 msgstr "Gefahrenzone"
 
-#: src/view/screens/Settings.tsx:622
+#: src/view/screens/Settings.tsx:655
 msgid "Delete account"
 msgstr "Konto löschen"
 
@@ -642,7 +646,7 @@ msgstr "Liste löschen"
 msgid "Delete my account"
 msgstr "Mein Konto löschen"
 
-#: src/view/screens/Settings.tsx:632
+#: src/view/screens/Settings.tsx:665
 msgid "Delete my account…"
 msgstr "Mein Konto löschen..."
 
@@ -669,7 +673,7 @@ msgstr "Beschreibung"
 msgid "Dev Server"
 msgstr "Entwicklungs-Server"
 
-#: src/view/screens/Settings.tsx:637
+#: src/view/screens/Settings.tsx:670
 msgid "Developer Tools"
 msgstr "Werkzeuge für Entwickler"
 
@@ -778,6 +782,14 @@ msgstr "Email aktualiziert"
 msgid "Email:"
 msgstr "E-Mail:"
 
+#: src/view/com/modals/EmbedConsent.tsx:113
+msgid "Enable {0} only"
+msgstr ""
+
+#: src/view/com/modals/EmbedConsent.tsx:97
+msgid "Enable External Media"
+msgstr ""
+
 #: src/view/screens/PreferencesHomeFeed.tsx:144
 msgid "Enable this setting to only see replies between people you follow."
 msgstr "Aktivieren Sie diese Einstellung, um nur Antworten zwischen Personen zu sehen, denen Sie folgen."
@@ -822,6 +834,20 @@ msgstr "Alle"
 msgid "Expand alt text"
 msgstr "Alt-Text erweitern"
 
+#: src/view/com/modals/EmbedConsent.tsx:64
+msgid "External Media"
+msgstr ""
+
+#: src/view/com/modals/EmbedConsent.tsx:75
+#: src/view/screens/PreferencesExternalEmbeds.tsx:66
+msgid "External media may allow websites to collect information about you and your device. No information is sent or requested until you press the \"play\" button."
+msgstr ""
+
+#: src/view/screens/PreferencesExternalEmbeds.tsx:52
+#: src/view/screens/Settings.tsx:595
+msgid "External Media Preferences"
+msgstr ""
+
 #: src/view/com/auth/onboarding/RecommendedFeeds.tsx:109
 #: src/view/com/auth/onboarding/RecommendedFeeds.tsx:141
 msgid "Failed to load recommended feeds"
@@ -1318,6 +1344,11 @@ msgstr "Meine gespeicherte Feeds "
 msgid "Name"
 msgstr "Namen"
 
+#: src/view/com/modals/EmbedConsent.tsx:107
+#: src/view/com/modals/EmbedConsent.tsx:123
+msgid "Never load embeds from {0}"
+msgstr ""
+
 #: src/view/com/auth/onboarding/WelcomeMobile.tsx:72
 msgid "Never lose access to your followers and data."
 msgstr "Verlieren Sie nie den Zugriff auf Ihre Follower und Daten."
@@ -1389,6 +1420,10 @@ msgstr "Keine Ergebnisse gefunden für \"{query}\""
 msgid "No results found for {query}"
 msgstr "Keine Ergebnisse gefunden für {query}"
 
+#: src/view/com/modals/EmbedConsent.tsx:129
+msgid "No thanks"
+msgstr ""
+
 #: src/view/com/modals/Threadgate.tsx:82
 msgid "Nobody"
 msgstr "Niemand"
@@ -1443,6 +1478,10 @@ msgstr "Offene Navigation"
 msgid "Opens configurable language settings"
 msgstr "Öffnet die konfigurierbaren Spracheinstellungen"
 
+#: src/view/screens/Settings.tsx:587
+msgid "Opens external embeds settings"
+msgstr ""
+
 #: src/view/shell/desktop/RightNav.tsx:156
 #: src/view/shell/Drawer.tsx:641
 msgid "Opens list of invite codes"
@@ -1460,19 +1499,19 @@ msgstr "Öffnet die Moderationseinstellungen"
 msgid "Opens screen with all saved feeds"
 msgstr "Öffnet den Bildschirm mit allen gespeicherten Feeds"
 
-#: src/view/screens/Settings.tsx:581
+#: src/view/screens/Settings.tsx:614
 msgid "Opens the app password settings page"
 msgstr "Öffnet die Einstellungsseite für das App-Passwort"
 
 #: src/view/screens/Settings.tsx:473
 msgid "Opens the home feed preferences"
 msgstr "Öffnet die Homefeed-Einstellungen"
 
-#: src/view/screens/Settings.tsx:664
+#: src/view/screens/Settings.tsx:697
 msgid "Opens the storybook page"
 msgstr "Öffnet die Märchenbuchseite"
 
-#: src/view/screens/Settings.tsx:644
+#: src/view/screens/Settings.tsx:677
 msgid "Opens the system log page"
 msgstr "Öffnet die Systemprotokollseite"
 
@@ -1525,6 +1564,19 @@ msgstr "Bilder, die für Erwachsene gedacht sind."
 msgid "Pinned Feeds"
 msgstr "Angepinnte Feeds"
 
+#: src/view/com/util/post-embeds/ExternalGifEmbed.tsx:111
+msgid "Play {0}"
+msgstr ""
+
+#: src/view/com/util/post-embeds/ExternalPlayerEmbed.tsx:54
+#: src/view/com/util/post-embeds/ExternalPlayerEmbed.tsx:55
+msgid "Play Video"
+msgstr ""
+
+#: src/view/com/util/post-embeds/ExternalGifEmbed.tsx:110
+msgid "Plays the GIF"
+msgstr ""
+
 #: src/view/com/auth/create/state.ts:116
 msgid "Please choose your handle."
 msgstr "Bitte wählen Sie Ihren Handgriff."
@@ -1605,12 +1657,13 @@ msgstr "Primäre Sprache"
 msgid "Prioritize Your Follows"
 msgstr "Priorisieren Sie Ihre Anhängerschaft"
 
+#: src/view/screens/Settings.tsx:570
 #: src/view/shell/desktop/RightNav.tsx:84
 msgid "Privacy"
 msgstr "Privatsphäre"
 
 #: src/view/screens/PrivacyPolicy.tsx:29
-#: src/view/screens/Settings.tsx:750
+#: src/view/screens/Settings.tsx:783
 #: src/view/shell/Drawer.tsx:262
 msgid "Privacy Policy"
 msgstr "Datenschutzbestimmungen"
@@ -1627,7 +1680,7 @@ msgstr "Verarbeitung..."
 msgid "Profile"
 msgstr "Profile"
 
-#: src/view/screens/Settings.tsx:808
+#: src/view/screens/Settings.tsx:841
 msgid "Protect your account by verifying your email."
 msgstr "Schützen Sie Ihr Konto, indem Sie Ihre E-Mail verifizieren."
 
@@ -1774,23 +1827,23 @@ msgstr "Für diesen Anbieter erforderlich"
 msgid "Reset code"
 msgstr "Code zurücksetzen"
 
-#: src/view/screens/Settings.tsx:686
+#: src/view/screens/Settings.tsx:719
 msgid "Reset onboarding state"
 msgstr "Onboarding-Status zurücksetzen"
 
 #: src/view/com/auth/login/ForgotPasswordForm.tsx:98
 msgid "Reset password"
 msgstr "Passwort zurücksetzen"
 
-#: src/view/screens/Settings.tsx:676
+#: src/view/screens/Settings.tsx:709
 msgid "Reset preferences state"
 msgstr "Einstellungen zurücksetzen"
 
-#: src/view/screens/Settings.tsx:684
+#: src/view/screens/Settings.tsx:717
 msgid "Resets the onboarding state"
 msgstr "Onboarding-Status zurücksetzen"
 
-#: src/view/screens/Settings.tsx:674
+#: src/view/screens/Settings.tsx:707
 msgid "Resets the preferences state"
 msgstr "Setzt den Zustand der Einstellungen zurück"
 
@@ -1957,6 +2010,10 @@ msgstr "Zeigen"
 msgid "Show anyway"
 msgstr "Trotzdem anzeigen"
 
+#: src/view/com/modals/EmbedConsent.tsx:87
+msgid "Show embeds from {0}"
+msgstr ""
+
 #: src/view/screens/PreferencesHomeFeed.tsx:255
 msgid "Show Posts from My Feeds"
 msgstr "Beiträge von My Feeds anzeigen"
@@ -2064,11 +2121,11 @@ msgstr "Platz"
 msgid "Staging"
 msgstr "Aufführung"
 
-#: src/view/screens/Settings.tsx:730
+#: src/view/screens/Settings.tsx:763
 msgid "Status page"
 msgstr "Status-Seite"
 
-#: src/view/screens/Settings.tsx:666
+#: src/view/screens/Settings.tsx:699
 msgid "Storybook"
 msgstr "Märchenbuch"
 
@@ -2097,7 +2154,7 @@ msgstr "Unterstützung"
 msgid "Switch Account"
 msgstr "Konto wechseln"
 
-#: src/view/screens/Settings.tsx:646
+#: src/view/screens/Settings.tsx:679
 msgid "System log"
 msgstr "System-Protokoll"
 
@@ -2109,7 +2166,7 @@ msgstr "Groß"
 msgid "Terms"
 msgstr "Bedingungen"
 
-#: src/view/screens/Settings.tsx:744
+#: src/view/screens/Settings.tsx:777
 #: src/view/screens/TermsOfService.tsx:29
 #: src/view/shell/Drawer.tsx:256
 msgid "Terms of Service"
@@ -2164,6 +2221,10 @@ msgstr "Diese {screenDescription} wurde markiert:"
 msgid "This account has requested that users sign in to view their profile."
 msgstr "Dieses Konto hat die Benutzer aufgefordert, sich anzumelden, um ihr Profil zu sehen."
 
+#: src/view/com/modals/EmbedConsent.tsx:68
+msgid "This content is hosted by {0}. Do you want to enable external media?"
+msgstr ""
+
 #: src/view/com/posts/FeedErrorMessage.tsx:107
 msgid "This content is not viewable without a Bluesky account."
 msgstr "Dieser Inhalt kann ohne Bluesky-Konto nicht angezeigt werden."
@@ -2328,15 +2389,15 @@ msgstr "Benutzer gefolgt von <0/>"
 msgid "Users in \"{0}\""
 msgstr "Benutzer in \"{0}\""
 
-#: src/view/screens/Settings.tsx:769
+#: src/view/screens/Settings.tsx:802
 msgid "Verify email"
 msgstr "E-Mail überprüfen"
 
-#: src/view/screens/Settings.tsx:794
+#: src/view/screens/Settings.tsx:827
 msgid "Verify my email"
 msgstr "E-Mail überprüfen"
 
-#: src/view/screens/Settings.tsx:803
+#: src/view/screens/Settings.tsx:836
 msgid "Verify My Email"
 msgstr "E-Mail überprüfen"