Reduce lint

Signed-off-by: alperozturk <alper_ozturk@proton.me>

app/src/main/java/com/owncloud/android/ui/adapter/CertificateCombinedExceptionViewAdapter.java

@@ -16,18 +16,20 @@ import com.owncloud.android.databinding.SslUntrustedCertLayoutBinding;
 import com.owncloud.android.lib.common.network.CertificateCombinedException;
 import com.owncloud.android.ui.dialog.SslUntrustedCertDialog;
 
+import androidx.annotation.NonNull;
+
 public class CertificateCombinedExceptionViewAdapter implements SslUntrustedCertDialog.ErrorViewAdapter {
 
     //private final static String TAG = CertificateCombinedExceptionViewAdapter.class.getSimpleName();
 
-    private CertificateCombinedException mSslException;
+    private final CertificateCombinedException mSslException;
 
     public CertificateCombinedExceptionViewAdapter(CertificateCombinedException sslException) {
         mSslException = sslException;
     }
 
     @Override
-    public void updateErrorView(SslUntrustedCertLayoutBinding binding) {
+    public void updateErrorView(@NonNull SslUntrustedCertLayoutBinding binding) {
         /// clean
         binding.reasonNoInfoAboutError.setVisibility(View.GONE);
 

app/src/main/java/com/owncloud/android/ui/adapter/SslCertificateViewAdapter.java

@@ -24,7 +24,7 @@ public class SslCertificateViewAdapter implements SslUntrustedCertDialog.Certifi
 
     //private final static String TAG = SslCertificateViewAdapter.class.getSimpleName();
 
-    private SslCertificate mCertificate;
+    private final SslCertificate mCertificate;
 
     /**
      * Constructor
@@ -36,7 +36,7 @@ public class SslCertificateViewAdapter implements SslUntrustedCertDialog.Certifi
     }
 
     @Override
-    public void updateCertificateView(SslUntrustedCertLayoutBinding binding) {
+    public void updateCertificateView(@NonNull SslUntrustedCertLayoutBinding binding) {
         if (mCertificate != null) {
             binding.nullCert.setVisibility(View.GONE);
             showSubject(mCertificate.getIssuedTo(), binding);

app/src/main/java/com/owncloud/android/ui/adapter/SslErrorViewAdapter.java

@@ -14,6 +14,8 @@ import android.view.View;
 import com.owncloud.android.databinding.SslUntrustedCertLayoutBinding;
 import com.owncloud.android.ui.dialog.SslUntrustedCertDialog;
 
+import androidx.annotation.NonNull;
+
 /**
  * Dialog to show an Untrusted Certificate
  */
@@ -21,14 +23,14 @@ public class SslErrorViewAdapter implements SslUntrustedCertDialog.ErrorViewAdap
 
     //private final static String TAG = SslErrorViewAdapter.class.getSimpleName();
 
-    private SslError mSslError;
+    private final SslError mSslError;
 
     public SslErrorViewAdapter(SslError sslError) {
         mSslError = sslError;
     }
 
     @Override
-    public void updateErrorView(SslUntrustedCertLayoutBinding binding) {
+    public void updateErrorView(@NonNull SslUntrustedCertLayoutBinding binding) {
         /// clean
         binding.reasonNoInfoAboutError.setVisibility(View.GONE);
 

app/src/main/java/com/owncloud/android/ui/adapter/X509CertificateViewAdapter.java

@@ -37,7 +37,7 @@ import androidx.annotation.NonNull;
  */
 public class X509CertificateViewAdapter implements SslUntrustedCertDialog.CertificateViewAdapter {
 
-    private X509Certificate mCertificate;
+    private final X509Certificate mCertificate;
 
     private static final String TAG = X509CertificateViewAdapter.class.getSimpleName();
 
@@ -46,7 +46,7 @@ public class X509CertificateViewAdapter implements SslUntrustedCertDialog.Certif
     }
 
     @Override
-    public void updateCertificateView(SslUntrustedCertLayoutBinding binding) {
+    public void updateCertificateView(@NonNull SslUntrustedCertLayoutBinding binding) {
         if (mCertificate != null) {
             binding.nullCert.setVisibility(View.GONE);
             showSubject(mCertificate.getSubjectX500Principal(), binding);
@@ -97,7 +97,7 @@ public class X509CertificateViewAdapter implements SslUntrustedCertDialog.Certif
 
     private String getDigestHexBytesWithColonsAndNewLines(Context context, final String digestType, final byte [] cert) {
         final byte[] rawDigest;
-        final String newLine = System.getProperty("line.separator");
+        final String newLine = System.lineSeparator();
 
         rawDigest = getDigest(digestType, cert);
 

app/src/main/java/com/owncloud/android/ui/dialog/SslUntrustedCertDialog.kt

@@ -76,27 +76,29 @@ open class SslUntrustedCertDialog : DialogFragment(), Injectable {
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
         Log_OC.d(TAG, "onCreateDialog, savedInstanceState is $savedInstanceState")
 
-        binding = SslUntrustedCertLayoutBinding.inflate(layoutInflater, null, false)
-        binding?.detailsScroll?.visibility = View.GONE
-        mErrorViewAdapter?.updateErrorView(binding)
+        val layoutBinding = SslUntrustedCertLayoutBinding.inflate(layoutInflater, null, false)
+        this.binding = layoutBinding
 
-        binding?.ok?.setOnClickListener(OnCertificateTrusted())
+        layoutBinding.detailsScroll.visibility = View.GONE
+        mErrorViewAdapter?.updateErrorView(layoutBinding)
 
-        binding?.cancel?.setOnClickListener(OnCertificateNotTrusted())
+        layoutBinding.ok.setOnClickListener(OnCertificateTrusted())
 
-        binding?.detailsBtn?.setOnClickListener { v: View ->
-            if (binding?.detailsScroll?.visibility == View.VISIBLE) {
-                binding?.detailsScroll?.visibility = View.GONE
+        layoutBinding.cancel.setOnClickListener(OnCertificateNotTrusted())
+
+        layoutBinding.detailsBtn.setOnClickListener { v: View ->
+            if (layoutBinding.detailsScroll.visibility == View.VISIBLE) {
+                layoutBinding.detailsScroll.visibility = View.GONE
                 (v as Button).setText(R.string.ssl_validator_btn_details_see)
             } else {
-                binding?.detailsScroll?.visibility = View.VISIBLE
+                layoutBinding.detailsScroll.visibility = View.VISIBLE
                 (v as Button).setText(R.string.ssl_validator_btn_details_hide)
-                mCertificateViewAdapter?.updateCertificateView(binding)
+                mCertificateViewAdapter?.updateCertificateView(layoutBinding)
             }
         }
 
         val builder = MaterialAlertDialogBuilder(requireContext())
-        builder.setView(binding?.getRoot())
+        builder.setView(layoutBinding.getRoot())
 
         viewThemeUtils?.dialog?.colorMaterialAlertDialogBackground(requireContext(), builder)
 
@@ -155,11 +157,11 @@ open class SslUntrustedCertDialog : DialogFragment(), Injectable {
     }
 
     interface ErrorViewAdapter {
-        fun updateErrorView(binding: SslUntrustedCertLayoutBinding?)
+        fun updateErrorView(binding: SslUntrustedCertLayoutBinding)
     }
 
     interface CertificateViewAdapter {
-        fun updateCertificateView(binding: SslUntrustedCertLayoutBinding?)
+        fun updateCertificateView(binding: SslUntrustedCertLayoutBinding)
     }
 
     companion object {