Merge branch 'fix/tls-hostname-verification' of https://github.com/zerox80/android into fix/tls-hostname-verification

Author: zerox80

opencloudApp/src/main/java/eu/opencloud/android/ui/dialog/SslUntrustedCertDialog.java

@@ -143,14 +143,14 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
         Button ok = mView.findViewById(R.id.ok);
         ok.setOnClickListener(new OnCertificateTrusted());
 
+        Button cancel = mView.findViewById(R.id.btnCancel);
+        cancel.setOnClickListener(new OnCertificateNotTrusted());
+
         if (m509Certificate == null) {
             ok.setText(android.R.string.ok);
             mView.findViewById(R.id.question).setVisibility(View.GONE);
+            cancel.setVisibility(View.GONE);
         }
-
-        Button cancel = mView.findViewById(R.id.btnCancel);
-        cancel.setOnClickListener(new OnCertificateNotTrusted());
-
         Button details = mView.findViewById(R.id.details_btn);
         details.setOnClickListener(new OnClickListener() {
 
@@ -226,7 +226,7 @@ public void onClick(View v) {
                     ((OnSslUntrustedCertListener) activity).onFailedSavingCertificate();
                     Timber.e(e, "Server certificate could not be saved in the known-servers trust store ");
                 }
-            } else {
+            } else if (mHandler == null) {
                 ((OnSslUntrustedCertListener) getActivity()).onCancelCertificate();
             }
         }