1
0
Fork 0
mirror of https://gitlab.com/fdroid/fdroidclient.git synced 2024-07-19 03:36:05 +02:00

Merge branch 'network-settings' into 'master'

🍜 network settings: combine proxy and ipfs

Closes #2722

See merge request fdroid/fdroidclient!1323
This commit is contained in:
Hans-Christoph Steiner 2023-12-06 10:04:58 +00:00
commit 0976b74293

View file

@ -112,6 +112,15 @@
</PreferenceCategory>
<PreferenceCategory android:title="@string/proxy">
<PreferenceScreen
android:key="ipfsGateways"
android:summary="@string/ipfsgw_summary_disabled"
android:title="@string/ipfsgw_title">
<intent
android:action="android.intent.action.MAIN"
android:targetClass="org.fdroid.fdroid.views.IpfsGatewaySettingsActivity"
android:targetPackage="@string/applicationId" />
</PreferenceScreen>
<SwitchPreferenceCompat
android:key="useTor"
android:summary="@string/useTorSummary"
@ -202,16 +211,6 @@
android:key="sendToFdroidMetrics"
android:summary="@string/send_to_fdroid_metrics_summary"
android:title="@string/send_to_fdroid_metrics" />
<PreferenceScreen
android:dependency="expert"
android:key="ipfsGateways"
android:summary="@string/ipfsgw_summary_disabled"
android:title="@string/ipfsgw_title">
<intent
android:action="android.intent.action.MAIN"
android:targetClass="org.fdroid.fdroid.views.IpfsGatewaySettingsActivity"
android:targetPackage="@string/applicationId" />
</PreferenceScreen>
<SwitchPreferenceCompat
android:defaultValue="false"
android:dependency="expert"