mirror/monocles_chat_clean
1
0
Fork 1
Code Activity

Merge remote-tracking branch 'origin/emoji_picker' into emoji_picker

Browse source
This commit is contained in:
Arne 2023-11-25 08:31:45 +01:00
commit 6329e72587
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/res/xml/preferences.xml
View file

@ -501,12 +501,14 @@
android:key="show_maps_inside"
android:summary="@string/pref_show_mappreview_inside_summary"
android:title="@string/pref_show_mappreview_inside" />
<!--
<EditTextPreference
android:defaultValue="@string/mappreview_url"
android:dependency="show_maps_inside"
android:key="mappreview_host"
android:summary="@string/pref_mappreview_host_summary"
android:title="@string/pref_mappreview_host" />
-->
<SwitchPreference
android:defaultValue="@bool/warn_unencrypted_chat"
android:key="warn_unencrypted_chat"