gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-06-20 12:09:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix settings client cert text

Browse Source 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
This commit is contained in:
Mario Danic 2018-04-26 11:28:16 +02:00
parent c8f3467880
commit 47b5c66f8f
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/java/com/nextcloud/talk/controllers/SettingsController.java
View File

@ -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 {