X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/5781090e2be3fddcb47d2d7e504e859321eb2ede..00482b6dcb1e98da39df54374f7098b51d66bee5:/src/com/owncloud/android/ui/dialog/SslValidatorDialog.java diff --git a/src/com/owncloud/android/ui/dialog/SslValidatorDialog.java b/src/com/owncloud/android/ui/dialog/SslValidatorDialog.java index 6ae4156d..1e31c0ca 100644 --- a/src/com/owncloud/android/ui/dialog/SslValidatorDialog.java +++ b/src/com/owncloud/android/ui/dialog/SslValidatorDialog.java @@ -1,5 +1,8 @@ -/* ownCloud Android client application - * Copyright (C) 2012-2013 ownCloud Inc. +/** + * ownCloud Android client application + * + * @author David A. Velasco + * Copyright (C) 2015 ownCloud Inc. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2, @@ -29,6 +32,8 @@ import java.util.Map; import javax.security.auth.x500.X500Principal; +import com.owncloud.android.R; + import android.app.Dialog; import android.content.Context; import android.os.Bundle; @@ -37,16 +42,13 @@ import android.view.Window; import android.widget.Button; import android.widget.TextView; -import com.owncloud.android.Log_OC; -import com.owncloud.android.R; -import com.owncloud.android.network.CertificateCombinedException; -import com.owncloud.android.network.OwnCloudClientUtils; -import com.owncloud.android.operations.RemoteOperationResult; +import com.owncloud.android.lib.common.network.CertificateCombinedException; +import com.owncloud.android.lib.common.network.NetworkUtils; +import com.owncloud.android.lib.common.operations.RemoteOperationResult; +import com.owncloud.android.lib.common.utils.Log_OC; /** * Dialog to request the user about a certificate that could not be validated with the certificates store in the system. - * - * @author David A. Velasco */ public class SslValidatorDialog extends Dialog { @@ -142,11 +144,11 @@ public class SslValidatorDialog extends Dialog { View detailsScroll = findViewById(R.id.details_scroll); if (detailsScroll.getVisibility() == View.VISIBLE) { detailsScroll.setVisibility(View.GONE); - ((Button)v).setText(R.string.ssl_validator_btn_details_see); + ((Button) v).setText(R.string.ssl_validator_btn_details_see); } else { detailsScroll.setVisibility(View.VISIBLE); - ((Button)v).setText(R.string.ssl_validator_btn_details_hide); + ((Button) v).setText(R.string.ssl_validator_btn_details_hide); } } }); @@ -222,6 +224,7 @@ public class SslValidatorDialog extends Dialog { return hex.toString(); } + @SuppressWarnings("deprecation") private void showValidity(Date notBefore, Date notAfter) { TextView fromView = ((TextView)mView.findViewById(R.id.value_validity_from)); TextView toView = ((TextView)mView.findViewById(R.id.value_validity_to)); @@ -342,7 +345,7 @@ public class SslValidatorDialog extends Dialog { private void saveServerCert() throws KeyStoreException, NoSuchAlgorithmException, CertificateException, IOException { if (mException.getServerCertificate() != null) { // TODO make this asynchronously, it can take some time - OwnCloudClientUtils.addCertToKnownServersStore(mException.getServerCertificate(), getContext()); + NetworkUtils.addCertToKnownServersStore(mException.getServerCertificate(), getContext()); } }