diff options
| author | cyberta <cyberta@riseup.net> | 2022-07-31 04:26:51 +0000 |
|---|---|---|
| committer | cyberta <cyberta@riseup.net> | 2022-07-31 04:26:51 +0000 |
| commit | 3bdbe09ffd7f4039f37af93b0da6b0965e09e0bd (patch) | |
| tree | 5de20333b567084efe8e260145c7d5ca374f8232 /app/src/main/res/layout/f_settings.xml | |
| parent | 2382b154db69a186e5fcf6600e5c4dceb11fb031 (diff) | |
| parent | 897278b0fe93552108d3b7b6a75ccd92818a3b83 (diff) | |
Merge branch 'obfuscation_gateway_pinning' into 'master'1.1.5RC1
Beta Release - Obfuscation gateway pinning
See merge request leap/bitmask_android!201
Diffstat (limited to 'app/src/main/res/layout/f_settings.xml')
| -rw-r--r-- | app/src/main/res/layout/f_settings.xml | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/app/src/main/res/layout/f_settings.xml b/app/src/main/res/layout/f_settings.xml index f89dc956..3ce19797 100644 --- a/app/src/main/res/layout/f_settings.xml +++ b/app/src/main/res/layout/f_settings.xml @@ -4,8 +4,9 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" + xmlns:tools="http://schemas.android.com/tools" android:padding="@dimen/stdpadding" - > + tools:viewBindingIgnore="true"> <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" @@ -123,5 +124,15 @@ app:subtitle="These transports might circumvent censorship, but are still in a testing phase" /> + <se.leap.bitmaskclient.base.views.IconSwitchEntry + android:id="@+id/obfuscation_proxy_pinning" + android:layout_width="match_parent" + android:layout_height="wrap_content" + app:text="Obfuscation proxy pinning" + app:singleLine="false" + app:subtitle="Connect to a specific obfuscation proxy for debugging purposes" + android:visibility="gone" + /> + </LinearLayout> </ScrollView>
\ No newline at end of file |