Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2025-12-25 13:39:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Attempt to fix reproducible build issue caused by EditProxyFragment.

Browse Source
This commit is contained in:
Cody Henthorne
2025-05-28 14:52:09 -04:00
parent 13d7bc54d3
commit e912bf3bc8
4 changed files with 25 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/main/res/navigation/app_settings_with_change_number.xml
View File

@@ -490,7 +490,7 @@
app:popExitAnim="@anim/fragment_close_exit" />
<action
android:id="@+id/action_dataAndStorageSettingsFragment_to_editProxyFragment"
app:destination="@id/editProxyFragment"
app:destination="@id/edit_proxy"
app:enterAnim="@anim/fragment_open_enter"
app:exitAnim="@anim/fragment_open_exit"
app:popEnterAnim="@anim/fragment_close_enter"
@@ -502,10 +502,7 @@
android:name="org.thoughtcrime.securesms.components.settings.app.storage.ManageStorageSettingsFragment"
android:label="storage_preference_fragment" />
<fragment
android:id="@+id/editProxyFragment"
android:name="org.thoughtcrime.securesms.preferences.EditProxyFragment"
android:label="edit_proxy_fragment" />
<include app:graph="@navigation/edit_proxy" />
<!-- endregion -->
@@ -588,7 +585,7 @@
<action
android:id="@+id/action_direct_to_editProxyFragment"
app:destination="@id/editProxyFragment"
app:destination="@id/edit_proxy"
app:enterAnim="@anim/fragment_open_enter"
app:exitAnim="@anim/fragment_open_exit"
app:popEnterAnim="@anim/fragment_close_enter"

17
app/src/main/res/navigation/edit_proxy.xml Normal file
View File

@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright 2025 Signal Messenger, LLC
~ SPDX-License-Identifier: AGPL-3.0-only
-->
<navigation xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/edit_proxy"
app:startDestination="@id/edit_proxy_fragment">
<fragment
android:id="@+id/edit_proxy_fragment"
android:name="org.thoughtcrime.securesms.preferences.EditProxyFragment"
tools:layout="@layout/edit_proxy_fragment" />
</navigation>

9
app/src/main/res/navigation/registration.xml
View File

@@ -101,7 +101,7 @@
<action
android:id="@+id/action_editProxy"
app:destination="@+id/registrationProxyFragment"
app:destination="@+id/edit_proxy"
app:enterAnim="@anim/nav_default_enter_anim"
app:exitAnim="@anim/nav_default_exit_anim"
app:popEnterAnim="@anim/nav_default_pop_enter_anim"
@@ -225,12 +225,7 @@
android:label="fragment_captcha"
tools:layout="@layout/fragment_registration_captcha" />
<fragment
android:id="@+id/registrationProxyFragment"
android:name="org.thoughtcrime.securesms.preferences.EditProxyFragment"
android:label="fragment_registration_edit_proxy"
tools:layout="@layout/edit_proxy_fragment" />
<include app:graph="@navigation/edit_proxy" />
<action
android:id="@+id/action_restart_to_welcomeFragment"

11
app/src/main/res/navigation/registration_v3.xml
View File

@@ -159,7 +159,7 @@
<action
android:id="@+id/action_editProxy"
app:destination="@+id/registrationProxyFragment"
app:destination="@+id/edit_proxy"
app:enterAnim="@anim/nav_default_enter_anim"
app:exitAnim="@anim/nav_default_exit_anim"
app:popEnterAnim="@anim/nav_default_pop_enter_anim"
@@ -309,13 +309,6 @@
android:label="fragment_captcha"
tools:layout="@layout/fragment_registration_captcha" />
<fragment
android:id="@+id/registrationProxyFragment"
android:name="org.thoughtcrime.securesms.preferences.EditProxyFragment"
android:label="fragment_registration_edit_proxy"
tools:layout="@layout/edit_proxy_fragment" />
<action
android:id="@+id/action_restart_to_welcomeFragment"
app:destination="@id/welcomeFragment"
@@ -326,4 +319,6 @@
app:popUpTo="@id/welcomeFragment"
app:popUpToInclusive="true" />
<include app:graph="@navigation/edit_proxy" />
</navigation>