aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res/xml
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2016-12-02 11:25:14 +0100
committerDaniel Gultsch <daniel@gultsch.de>2016-12-02 11:25:14 +0100
commit6b0242523b9284bf44977b072705dd92e531f446 (patch)
tree6d2a50df68ba2e63c7b41f483ef142114d4d34c2 /src/main/res/xml
parent5d4aa04e5d6db297890283c27dd2a41d499f9f13 (diff)
parent297c0a792f79ee7f10a99a6712a8d6d63d4ed008 (diff)
Merge branch 'master' of https://github.com/Fenisu/Conversations into Fenisu-master
Diffstat (limited to 'src/main/res/xml')
-rw-r--r--src/main/res/xml/file_paths.xml3
-rw-r--r--src/main/res/xml/preferences.xml11
2 files changed, 13 insertions, 1 deletions
diff --git a/src/main/res/xml/file_paths.xml b/src/main/res/xml/file_paths.xml
index 2a8bc766..6a5e2609 100644
--- a/src/main/res/xml/file_paths.xml
+++ b/src/main/res/xml/file_paths.xml
@@ -1,4 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<paths>
<external-path name="external" path="/"/>
+ <files-path path="Pictures/" name="pics" />
+ <files-path path="Files/" name="files" />
+ <cache-path path="Camera/" name="cam" />
</paths> \ No newline at end of file
diff --git a/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml
index 2ed24b2d..751f3bec 100644
--- a/src/main/res/xml/preferences.xml
+++ b/src/main/res/xml/preferences.xml
@@ -163,7 +163,8 @@
android:key="expert"
android:summary="@string/pref_expert_options_summary"
android:title="@string/pref_expert_options">
- <PreferenceCategory android:title="@string/pref_security_settings">
+ <PreferenceCategory android:title="@string/pref_security_settings"
+ android:key="security_options">
<CheckBoxPreference
android:defaultValue="true"
android:key="btbv"
@@ -189,6 +190,14 @@
android:title="@string/pref_allow_message_correction"
android:summary="@string/pref_allow_message_correction_summary"/>
<Preference
+ android:key="clean_cache"
+ android:summary="@string/pref_clean_cache_summary"
+ android:title="@string/pref_clean_cache"/>
+ <Preference
+ android:key="clean_private_storage"
+ android:summary="@string/pref_clean_private_storage_summary"
+ android:title="@string/pref_clean_private_storage"/>
+ <Preference
android:key="delete_omemo_identities"
android:title="@string/pref_delete_omemo_identities"
android:summary="@string/pref_delete_omemo_identities_summary"/>