diff options
| author | Daniel Gultsch <daniel@gultsch.de> | 2016-12-02 11:25:14 +0100 |
|---|---|---|
| committer | Daniel Gultsch <daniel@gultsch.de> | 2016-12-02 11:25:14 +0100 |
| commit | 6b0242523b9284bf44977b072705dd92e531f446 (patch) | |
| tree | 6d2a50df68ba2e63c7b41f483ef142114d4d34c2 /src/main/res | |
| parent | 5d4aa04e5d6db297890283c27dd2a41d499f9f13 (diff) | |
| parent | 297c0a792f79ee7f10a99a6712a8d6d63d4ed008 (diff) | |
Merge branch 'master' of https://github.com/Fenisu/Conversations into Fenisu-master
Diffstat (limited to 'src/main/res')
| -rw-r--r-- | src/main/res/values/strings.xml | 4 | ||||
| -rw-r--r-- | src/main/res/xml/file_paths.xml | 3 | ||||
| -rw-r--r-- | src/main/res/xml/preferences.xml | 11 |
3 files changed, 17 insertions, 1 deletions
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 352180d2..57599032 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -715,4 +715,8 @@ <string name="blindly_trusted_omemo_keys">Blindly trusted OMEMO keys</string> <string name="not_trusted">Untrusted</string> <string name="invalid_barcode">Invalid 2D barcode</string> + <string name="pref_clean_cache_summary">Clean cache folder (used by Camera Application)</string> + <string name="pref_clean_cache">Clean cache</string> + <string name="pref_clean_private_storage">Clean private storage</string> + <string name="pref_clean_private_storage_summary">Clean private storage where files are kept (They can be re-downloaded from the server)</string> </resources> 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"/> |