removed trustSSL-setting for zabbix-servers, this is now covered by t…

…he general ask-to-trust-certificates-option
NiciDieNase · Feb 16, 2016 · 55ee2c3 · 55ee2c3
1 parent b677a92
commit 55ee2c3
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 10 deletions.
diff --git a/src/main/java/com/inovex/zabbixmobile/activities/ZabbixServerPreferenceActivity.java b/src/main/java/com/inovex/zabbixmobile/activities/ZabbixServerPreferenceActivity.java
@@ -58,7 +58,6 @@ public class ZabbixServerPreferenceActivity extends PreferenceActivity implement
 	private static final String ZABBIX_URL_KEY  = "zabbix_url";
 	private static final String ZABBIX_USER_KEY = "zabbix_username";
 	private static final String ZABBIX_PASSWORD_KEY = "zabbix_password";
-	private static final String ZABBIX_TRUST_ALL_SSL_CA_KEY = "zabbix_trust_all_ssl_ca";
 	private static final String ZABBIX_HTTP_AUTH_ENABLED_KEY = "http_auth_enabled";
 	private static final String ZABBIX_HTTP_AUTH_USER_KEY = "http_auth_username";
 	private static final String ZABBIX_HTTP_AUTH_PASSWORD_KEY = "http_auth_password";
@@ -170,7 +169,6 @@ public void onSharedPreferenceChanged(SharedPreferences sharedPreferences,
 
 		if (key.equals(ZABBIX_URL_KEY) || key.equals(ZABBIX_USER_KEY)
 				|| key.equals(ZABBIX_PASSWORD_KEY)
-				|| key.equals(ZABBIX_TRUST_ALL_SSL_CA_KEY)
 				|| key.equals(ZABBIX_HTTP_AUTH_ENABLED_KEY)
 				|| key.equals(ZABBIX_HTTP_AUTH_USER_KEY)
 				|| key.equals(ZABBIX_HTTP_AUTH_PASSWORD_KEY)) {

diff --git a/src/main/java/com/inovex/zabbixmobile/model/ZaxServerPreferences.java b/src/main/java/com/inovex/zabbixmobile/model/ZaxServerPreferences.java
@@ -45,7 +45,6 @@ private void loadPrefs() {
 		edit.putString("zabbix_url", getZabbixUrl());
 		edit.putString("zabbix_username", getUsername());
 		edit.putString("zabbix_password", getPassword());
-		edit.putBoolean("zabbix_trust_all_ssl_ca", isTrustAllSSLCA());
 		edit.putBoolean("http_auth_enabled", isHttpAuthEnabled());
 		edit.putString("http_auth_username", getHttpAuthUsername());
 		edit.putString("http_auth_password", getHttpAuthPassword());
@@ -57,7 +56,6 @@ public void savePrefs() {
 		edit.putString(serverId + "zabbix_url", mPref.getString("zabbix_url", ""));
 		edit.putString(serverId + "zabbix_username", mPref.getString("zabbix_username", ""));
 		edit.putString(serverId + "zabbix_password", mPref.getString("zabbix_password", ""));
-		edit.putBoolean(serverId + "zabbix_trust_all_ssl_ca", mPref.getBoolean("zabbix_trust_all_ssl_ca", false));
 		edit.putBoolean(serverId + "http_auth_enabled", mPref.getBoolean("http_auth_enabled", false));
 		edit.putString(serverId + "http_auth_username", mPref.getString("http_auth_username", ""));
 		edit.putString(serverId + "http_auth_password", mPref.getString("http_auth_password", ""));
@@ -78,10 +76,6 @@ public String getPassword() {
 		return mPref.getString(serverId + "zabbix_password", "");
 	}
 
-	public boolean isTrustAllSSLCA() {
-		return mPref.getBoolean(serverId + "zabbix_trust_all_ssl_ca", false);
-	}
-
 	public boolean isHttpAuthEnabled() {
 		return mPref.getBoolean(serverId + "http_auth_enabled", false);
 	}

diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
@@ -102,8 +102,6 @@ This file is part of ZAX.
     <string name="share">Share</string>
     <string name="comment">Comment</string>
     <string name="cancel">Cancel</string>
-    <string name="trust_all_ssl_certificates">Trust all SSL Certificates</string>
-    <string name="trust_all_ssl_certificates_description">Enable this option if you are using SSL and your server\'s certificate is not issued by a certificate authority trusted by your device. Attention: This basically disables SSL. Check only if you know what you are doing!</string>
     <string name="homescreen_widget">Homescreen Widget</string>
     <string name="theme">Theme</string>
     <string name="theme_dark">Use dark theme</string>