diff options
| author | Andrew Dolgov <[email protected]> | 2011-11-27 10:04:28 +0300 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2011-11-27 10:04:28 +0300 |
| commit | 0bf4c51052dcb81d2b9069a8f2ab125fba8aa343 (patch) | |
| tree | 2996508712cdd2be1125251aac2f9822555fb3e0 /res | |
| parent | d30bb778c053ebfc9993ce294656c2eaf209b782 (diff) | |
add option to trust all SSL certificates
Diffstat (limited to 'res')
| -rw-r--r-- | res/values/strings.xml | 2 | ||||
| -rw-r--r-- | res/xml/preferences.xml | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index c190ac3a..7c7408fb 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -21,6 +21,7 @@ <string name="preferences">Preferences</string> <string name="theme_light">Light</string> <string name="login_api_disabled">Login failed: API disabled.</string> + <string name="login_no_data">Login failed: no data received.</string> <string name="login_wrong_password">Login failed: username or password incorrect.</string> <string name="login_success">Logged in.</string> <string name="no_unread_feeds">No unread feeds.</string> @@ -36,4 +37,5 @@ <string name="load_more_articles">Load more...</string> <string name="show_all_articles">Show all articles</string> <string name="show_unread_articles">Show unread articles</string> + <string name="ssl_trust_any">Accept any SSL certificate</string> </resources> diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml index 10cb3cca..1c102fb0 100644 --- a/res/xml/preferences.xml +++ b/res/xml/preferences.xml @@ -8,7 +8,7 @@ <EditTextPreference android:title="@string/login" android:key="login" android:singleLine="true"></EditTextPreference>
<EditTextPreference android:title="@string/password" android:key="password" android:singleLine="true" android:password="true"></EditTextPreference>
<EditTextPreference android:key="ttrss_url" android:title="@string/ttrss_url" android:singleLine="true" textUri="true" android:hint="@string/default_url"></EditTextPreference>
- <!-- <CheckBoxPreference android:defaultValue="true" android:title="@string/auto_login" android:key="auto_login" /> -->
+ <CheckBoxPreference android:defaultValue="false" android:title="@string/ssl_trust_any" android:key="ssl_trust_any" />
</PreferenceCategory>
|