From 80aa521e426a0a5284a473a17027281bdf7ae4b4 Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Fri, 26 Jun 2026 14:37:56 -0400
Subject: [PATCH] Add proxy setting to regV5.

---
 .../securesms/ApplicationContext.java         |  5 ++
 .../registration/src/main/AndroidManifest.xml |  2 +-
 .../sample/RegistrationApplication.kt         |  7 +++
 .../src/main/res/values/themes.xml            |  8 +++
 .../registration/RegistrationDependencies.kt  |  4 +-
 .../phonenumber/PhoneNumberEntryScreen.kt     |  5 +-
 .../quickrestore/QuickRestoreQrEvents.kt      |  1 -
 .../quickrestore/QuickRestoreQrScreen.kt      | 51 +++++++++++++++++++
 .../quickrestore/QuickRestoreQrViewModel.kt   |  3 --
 reproducible-builds/Dockerfile                |  2 +
 10 files changed, 81 insertions(+), 7 deletions(-)
 create mode 100644 demo/registration/src/main/res/values/themes.xml

diff --git a/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java b/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java
index 144308e1ad..b3cf8229af 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java
@@ -52,6 +52,7 @@ import org.signal.ringrtc.CallManager;
 import org.thoughtcrime.securesms.apkupdate.ApkUpdateRefreshListener;
 import org.thoughtcrime.securesms.avatar.AvatarPickerStorage;
 import org.thoughtcrime.securesms.backup.v2.BackupRepository;
+import org.thoughtcrime.securesms.components.settings.app.AppSettingsActivity;
 import org.thoughtcrime.securesms.conversation.drafts.DraftBlobs;
 import org.thoughtcrime.securesms.crypto.AppAttachmentSecretStore;
 import org.thoughtcrime.securesms.crypto.DatabaseSecretProvider;
@@ -433,6 +434,10 @@ public class ApplicationContext extends Application implements AppForegroundObse
         context -> {
           context.startActivity(new Intent(context, SubmitDebugLogActivity.class));
           return Unit.INSTANCE;
+        },
+        context -> {
+          context.startActivity(AppSettingsActivity.proxy(context));
+          return Unit.INSTANCE;
         }
       )
     );
diff --git a/demo/registration/src/main/AndroidManifest.xml b/demo/registration/src/main/AndroidManifest.xml
index b45a9f10a0..2bd79c6347 100644
--- a/demo/registration/src/main/AndroidManifest.xml
+++ b/demo/registration/src/main/AndroidManifest.xml
@@ -19,7 +19,7 @@
     android:fullBackupOnly="false"
     android:icon="@mipmap/ic_launcher"
     android:label="Registration Sample"
-    android:theme="@android:style/Theme.Material.NoActionBar"
+    android:theme="@style/Theme.RegistrationSample"
     android:supportsRtl="true">
 
     <!-- Disable Firebase Analytics -->
diff --git a/demo/registration/src/main/java/org/signal/registration/sample/RegistrationApplication.kt b/demo/registration/src/main/java/org/signal/registration/sample/RegistrationApplication.kt
index d70deddb9d..36624008b2 100644
--- a/demo/registration/src/main/java/org/signal/registration/sample/RegistrationApplication.kt
+++ b/demo/registration/src/main/java/org/signal/registration/sample/RegistrationApplication.kt
@@ -7,6 +7,7 @@ package org.signal.registration.sample
 
 import android.app.Application
 import android.os.Build
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import org.signal.core.models.ServiceId.ACI
 import org.signal.core.models.ServiceId.PNI
 import org.signal.core.ui.CoreUiDependencies
@@ -62,6 +63,12 @@ class RegistrationApplication : Application() {
         storageController = storageController,
         sensitiveLogger = LogLogger,
         debugLogCallback = {},
+        proxyConfigCallback = { context ->
+          MaterialAlertDialogBuilder(context)
+            .setMessage("Proxy configuration not supported in the demo.")
+            .setPositiveButton(android.R.string.ok, null)
+            .show()
+        },
         isLinkAndSyncAvailable = false
       )
     )
diff --git a/demo/registration/src/main/res/values/themes.xml b/demo/registration/src/main/res/values/themes.xml
new file mode 100644
index 0000000000..ac4ef34393
--- /dev/null
+++ b/demo/registration/src/main/res/values/themes.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <!--
+    Material3 (a Theme.AppCompat descendant) so View-based Material components such as
+    MaterialAlertDialogBuilder work. The Compose UI supplies its own theme via SignalTheme.
+  -->
+  <style name="Theme.RegistrationSample" parent="Theme.Material3.DayNight.NoActionBar" />
+</resources>
diff --git a/feature/registration/src/main/java/org/signal/registration/RegistrationDependencies.kt b/feature/registration/src/main/java/org/signal/registration/RegistrationDependencies.kt
index 006ced4c15..46248a4517 100644
--- a/feature/registration/src/main/java/org/signal/registration/RegistrationDependencies.kt
+++ b/feature/registration/src/main/java/org/signal/registration/RegistrationDependencies.kt
@@ -15,13 +15,15 @@ import org.signal.registration.util.SensitiveLog
  * @param sensitiveLogger A logger for logging sensitive material. The intention is this would only be used in the demo app for testing + debugging, while
  *   the actual app would just pass null.
  * @param debugLogCallback Callback to launch the debug log viewer. The actual app provides the real implementation.
+ * @param proxyConfigCallback Callback to launch the proxy configuration settings. The actual app provides the real implementation.
  */
 class RegistrationDependencies(
   val networkController: NetworkController,
   val storageController: StorageController,
   val isLinkAndSyncAvailable: Boolean,
   val sensitiveLogger: Log.Logger?,
-  val debugLogCallback: ((Context) -> Unit)?
+  val debugLogCallback: ((Context) -> Unit)?,
+  val proxyConfigCallback: ((Context) -> Unit)?
 ) {
   companion object {
     lateinit var dependencies: RegistrationDependencies
diff --git a/feature/registration/src/main/java/org/signal/registration/screens/phonenumber/PhoneNumberEntryScreen.kt b/feature/registration/src/main/java/org/signal/registration/screens/phonenumber/PhoneNumberEntryScreen.kt
index 635b973b88..2f3b227b4b 100644
--- a/feature/registration/src/main/java/org/signal/registration/screens/phonenumber/PhoneNumberEntryScreen.kt
+++ b/feature/registration/src/main/java/org/signal/registration/screens/phonenumber/PhoneNumberEntryScreen.kt
@@ -78,6 +78,7 @@ import org.signal.core.ui.compose.Scaffolds
 import org.signal.core.util.Util
 import org.signal.core.util.logging.Log
 import org.signal.registration.R
+import org.signal.registration.RegistrationDependencies
 import org.signal.registration.screens.OnePaneRegistrationScaffold
 import org.signal.registration.screens.RegistrationScaffold
 import org.signal.registration.screens.TwoPaneRegistrationScaffold
@@ -345,6 +346,8 @@ private fun TwoPaneLayout(
 fun TopAppBar(
   scrollBehavior: TopAppBarScrollBehavior
 ) {
+  val context = LocalContext.current
+
   Scaffolds.DefaultTopAppBar(
     title = "",
     titleContent = { _, _ -> },
@@ -372,7 +375,7 @@ fun TopAppBar(
         DropdownMenus.Item(
           text = { Text(text = stringResource(R.string.RegistrationActivity_use_proxy)) },
           onClick = {
-            TODO("Handle use proxy")
+            RegistrationDependencies.get().proxyConfigCallback?.invoke(context)
             menuController.hide()
           }
         )
diff --git a/feature/registration/src/main/java/org/signal/registration/screens/quickrestore/QuickRestoreQrEvents.kt b/feature/registration/src/main/java/org/signal/registration/screens/quickrestore/QuickRestoreQrEvents.kt
index 4054607879..f65fe21873 100644
--- a/feature/registration/src/main/java/org/signal/registration/screens/quickrestore/QuickRestoreQrEvents.kt
+++ b/feature/registration/src/main/java/org/signal/registration/screens/quickrestore/QuickRestoreQrEvents.kt
@@ -8,6 +8,5 @@ package org.signal.registration.screens.quickrestore
 sealed class QuickRestoreQrEvents {
   data object RetryQrCode : QuickRestoreQrEvents()
   data object Cancel : QuickRestoreQrEvents()
-  data object UseProxy : QuickRestoreQrEvents()
   data object DismissError : QuickRestoreQrEvents()
 }
diff --git a/feature/registration/src/main/java/org/signal/registration/screens/quickrestore/QuickRestoreQrScreen.kt b/feature/registration/src/main/java/org/signal/registration/screens/quickrestore/QuickRestoreQrScreen.kt
index 432017bb26..6e43e06953 100644
--- a/feature/registration/src/main/java/org/signal/registration/screens/quickrestore/QuickRestoreQrScreen.kt
+++ b/feature/registration/src/main/java/org/signal/registration/screens/quickrestore/QuickRestoreQrScreen.kt
@@ -26,30 +26,39 @@ import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material3.Button
 import androidx.compose.material3.CircularProgressIndicator
+import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.material3.TextButton
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.res.vectorResource
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import org.signal.core.ui.compose.AllDevicePreviews
 import org.signal.core.ui.compose.Dialogs
+import org.signal.core.ui.compose.DropdownMenus
+import org.signal.core.ui.compose.IconButtons.IconButton
 import org.signal.core.ui.compose.Previews
 import org.signal.core.ui.compose.QrCode
 import org.signal.core.ui.compose.QrCodeData
+import org.signal.core.ui.compose.Scaffolds
 import org.signal.core.ui.compose.SignalIcons
 import org.signal.registration.R
+import org.signal.registration.RegistrationDependencies
 import org.signal.registration.screens.OnePaneRegistrationScaffold
 import org.signal.registration.screens.RegistrationScaffold
 import org.signal.registration.screens.TwoPaneRegistrationScaffold
 import org.signal.registration.screens.attachDebugLogHelper
+import org.signal.core.ui.R as CoreR
 
 /**
  * Screen to display QR code for restoring from an old device.
@@ -80,6 +89,7 @@ private fun OnePaneLayout(
   OnePaneRegistrationScaffold(
     modifier = modifier.fillMaxSize(),
     params = params,
+    topBar = { TopAppBar() },
     content = { paddingValues ->
       Column(
         modifier = Modifier
@@ -118,6 +128,7 @@ private fun TwoPaneLayout(
   TwoPaneRegistrationScaffold(
     modifier = modifier.fillMaxSize(),
     params = params,
+    topBar = { TopAppBar() },
     firstPane = { paddingValues ->
       Column(
         modifier = Modifier
@@ -153,6 +164,46 @@ private fun TwoPaneLayout(
   )
 }
 
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+private fun TopAppBar() {
+  val context = LocalContext.current
+
+  Scaffolds.DefaultTopAppBar(
+    title = "",
+    titleContent = { _, _ -> },
+    onNavigationClick = { },
+    navigationIcon = null,
+    actions = {
+      val menuController = remember { DropdownMenus.MenuController() }
+
+      IconButton(
+        onClick = { menuController.show() },
+        modifier = Modifier.padding(horizontal = 8.dp)
+      ) {
+        Icon(
+          imageVector = ImageVector.vectorResource(CoreR.drawable.symbol_more_vertical_24),
+          contentDescription = stringResource(R.string.RegistrationActivity_open_menu)
+        )
+      }
+
+      DropdownMenus.Menu(
+        controller = menuController,
+        offsetX = 24.dp,
+        offsetY = 0.dp
+      ) {
+        DropdownMenus.Item(
+          text = { Text(text = stringResource(R.string.RegistrationActivity_use_proxy)) },
+          onClick = {
+            RegistrationDependencies.get().proxyConfigCallback?.invoke(context)
+            menuController.hide()
+          }
+        )
+      }
+    }
+  )
+}
+
 @Composable
 private fun Heading() {
   Text(
diff --git a/feature/registration/src/main/java/org/signal/registration/screens/quickrestore/QuickRestoreQrViewModel.kt b/feature/registration/src/main/java/org/signal/registration/screens/quickrestore/QuickRestoreQrViewModel.kt
index 3bf74a3f0a..59764fd7da 100644
--- a/feature/registration/src/main/java/org/signal/registration/screens/quickrestore/QuickRestoreQrViewModel.kt
+++ b/feature/registration/src/main/java/org/signal/registration/screens/quickrestore/QuickRestoreQrViewModel.kt
@@ -58,9 +58,6 @@ class QuickRestoreQrViewModel(
         parentEventEmitter.navigateBack()
         state
       }
-      is QuickRestoreQrEvents.UseProxy -> {
-        throw NotImplementedError("Proxy settings not implemented!")
-      }
       is QuickRestoreQrEvents.DismissError -> {
         startProvisioning()
         state.copy(showRegistrationError = false, errorMessage = null)
diff --git a/reproducible-builds/Dockerfile b/reproducible-builds/Dockerfile
index 6772a04010..a01736711d 100644
--- a/reproducible-builds/Dockerfile
+++ b/reproducible-builds/Dockerfile
@@ -22,6 +22,8 @@ ENV ANDROID_BUILD_TOOLS_VERSION=36.0.0
 ENV ANDROID_HOME=/usr/local/android-sdk-linux
 ENV PATH=${PATH}:${ANDROID_HOME}/tools:${ANDROID_HOME}/platform-tools:${ANDROID_HOME}/cmdline-tools/bin
 
+ENV HOME=/tmp
+
 RUN cd /usr/local/
 RUN wget -q "https://dl.google.com/android/repository/${ANDROID_COMMAND_LINE_TOOLS_FILENAME}"
 RUN echo "${ANDROID_COMMAND_LINE_TOOLS_SHA256}  ${ANDROID_COMMAND_LINE_TOOLS_FILENAME}" | sha256sum -c -