nutomic
/
syncthing-android
mirror of https://github.com/syncthing/syncthing-android.git
1
0
Fork 0
Code Releases Activity

Merge pull request #260 from Zillode/do-not-persist 

Persistent=false should be repeated for all subpreferences, a global persistent flag would have been too easy... (fixes #256)
This commit is contained in:
Felix Ableitner 2015-03-20 12:49:09 +01:00
parent 7b54ce59b1 2b9a79bdad
commit 718e1e9281
4 changed files with 30 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/res/xml/device_settings_create.xml
View File

@ -1,27 +1,31 @@
<?xml version="1.0" encoding="utf-8"?>
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
android:persistent="false">
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
<EditTextPreference
android:persistent="false"
android:key="device_id"
android:title="@string/device_id"
android:widgetLayout="@layout/scan_qr_code_widget" />
<EditTextPreference
android:persistent="false"
android:key="name"
android:title="@string/name" />
<EditTextPreference
android:persistent="false"
android:key="addresses"
android:title="@string/addresses" />
<ListPreference
android:persistent="false"
android:key="compression"
android:entries="@array/compress_entries"
android:entryValues="@array/compress_values"
android:title="@string/compression" />
<CheckBoxPreference
android:persistent="false"
android:key="introducer"
android:title="@string/introducer" />

10
src/main/res/xml/device_settings_edit.xml
View File

@ -1,35 +1,41 @@
<?xml version="1.0" encoding="utf-8"?>
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
android:persistent="false">
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
<Preference
android:persistent="false"
android:key="device_id"
android:title="@string/device_id" />
<EditTextPreference
android:persistent="false"
android:key="name"
android:title="@string/name" />
<EditTextPreference
android:persistent="false"
android:key="addresses"
android:title="@string/addresses" />
<ListPreference
android:persistent="false"
android:key="compression"
android:entries="@array/compress_entries"
android:entryValues="@array/compress_values"
android:title="@string/compression" />
<CheckBoxPreference
android:persistent="false"
android:key="introducer"
android:title="@string/introducer" />
<Preference
android:persistent="false"
android:key="version"
android:title="@string/syncthing_version_title"
style="?android:preferenceInformationStyle" />
<Preference
android:persistent="false"
android:key="current_address"
android:title="@string/current_address"
style="?android:preferenceInformationStyle" />

10
src/main/res/xml/folder_settings_create.xml
View File

@ -1,33 +1,39 @@
<?xml version="1.0" encoding="utf-8"?>
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
android:persistent="false">
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
<EditTextPreference
android:persistent="false"
android:key="folder_id"
android:title="@string/folder_id" />
<Preference
android:persistent="false"
android:key="directory"
android:title="@string/directory" />
<EditTextPreference
android:persistent="false"
android:key="rescan_interval"
android:title="@string/rescan_interval"
android:inputType="numberDecimal" />
<CheckBoxPreference
android:persistent="false"
android:key="folder_master"
android:title="@string/folder_master" />
<PreferenceScreen
android:persistent="false"
android:key="devices"
android:title="@string/devices" />
<CheckBoxPreference
android:persistent="false"
android:key="versioning"
android:title="@string/file_versioning" />
<EditTextPreference
android:persistent="false"
android:key="versioning_keep"
android:title="@string/keep_versions"
android:inputType="numberDecimal" />

10
src/main/res/xml/folder_settings_edit.xml
View File

@ -1,37 +1,43 @@
<?xml version="1.0" encoding="utf-8"?>
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
android:persistent="false">
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
<EditTextPreference
android:persistent="false"
android:key="folder_id"
android:title="@string/folder_id"
android:enabled="false"
style="?android:preferenceInformationStyle" />
<Preference
android:persistent="false"
android:key="directory"
android:title="@string/directory"
android:enabled="false"
style="?android:preferenceInformationStyle" />
<EditTextPreference
android:persistent="false"
android:key="rescan_interval"
android:title="@string/rescan_interval"
android:inputType="numberDecimal" />
<CheckBoxPreference
android:persistent="false"
android:key="folder_master"
android:title="@string/folder_master" />
<PreferenceScreen
android:persistent="false"
android:key="devices"
android:title="@string/devices" />
<CheckBoxPreference
android:persistent="false"
android:key="versioning"
android:title="File Versioning" />
<EditTextPreference
android:persistent="false"
android:key="versioning_keep"
android:title="@string/keep_versions"
android:inputType="numberDecimal" />