|
@@ -230,10 +230,6 @@ public class SettingsController extends BaseController {
|
|
.popChangeHandler(new VerticalChangeHandler()));
|
|
.popChangeHandler(new VerticalChangeHandler()));
|
|
});
|
|
});
|
|
|
|
|
|
- if (userEntity.getClientCertificate() != null) {
|
|
|
|
- certificateSetup.setTitle(R.string.nc_client_cert_change);
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
|
|
|
|
String host = null;
|
|
String host = null;
|
|
int port = -1;
|
|
int port = -1;
|
|
@@ -281,6 +277,12 @@ public class SettingsController extends BaseController {
|
|
dispose(null);
|
|
dispose(null);
|
|
userEntity = userUtils.getCurrentUser();
|
|
userEntity = userUtils.getCurrentUser();
|
|
|
|
|
|
|
|
+ if (!TextUtils.isEmpty(userEntity.getClientCertificate())) {
|
|
|
|
+ certificateSetup.setTitle(R.string.nc_client_cert_change);
|
|
|
|
+ } else {
|
|
|
|
+ certificateSetup.setTitle(R.string.nc_client_cert_setup);
|
|
|
|
+ }
|
|
|
|
+
|
|
if ("No proxy".equals(appPreferences.getProxyType()) || appPreferences.getProxyType() == null) {
|
|
if ("No proxy".equals(appPreferences.getProxyType()) || appPreferences.getProxyType() == null) {
|
|
hideProxySettings();
|
|
hideProxySettings();
|
|
} else {
|
|
} else {
|