|
@@ -27,8 +27,10 @@ import android.os.Bundle
|
|
import android.util.Log
|
|
import android.util.Log
|
|
import android.view.WindowManager
|
|
import android.view.WindowManager
|
|
import android.webkit.SslErrorHandler
|
|
import android.webkit.SslErrorHandler
|
|
|
|
+import androidx.appcompat.app.AlertDialog
|
|
import androidx.appcompat.app.AppCompatActivity
|
|
import androidx.appcompat.app.AppCompatActivity
|
|
import autodagger.AutoInjector
|
|
import autodagger.AutoInjector
|
|
|
|
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
|
|
import com.nextcloud.talk.R
|
|
import com.nextcloud.talk.R
|
|
import com.nextcloud.talk.application.NextcloudTalkApplication
|
|
import com.nextcloud.talk.application.NextcloudTalkApplication
|
|
import com.nextcloud.talk.events.CertificateEvent
|
|
import com.nextcloud.talk.events.CertificateEvent
|
|
@@ -36,7 +38,6 @@ import com.nextcloud.talk.ui.theme.ViewThemeUtils
|
|
import com.nextcloud.talk.utils.SecurityUtils
|
|
import com.nextcloud.talk.utils.SecurityUtils
|
|
import com.nextcloud.talk.utils.preferences.AppPreferences
|
|
import com.nextcloud.talk.utils.preferences.AppPreferences
|
|
import com.nextcloud.talk.utils.ssl.MagicTrustManager
|
|
import com.nextcloud.talk.utils.ssl.MagicTrustManager
|
|
-import com.yarolegovich.lovelydialog.LovelyStandardDialog
|
|
|
|
import org.greenrobot.eventbus.EventBus
|
|
import org.greenrobot.eventbus.EventBus
|
|
import org.greenrobot.eventbus.Subscribe
|
|
import org.greenrobot.eventbus.Subscribe
|
|
import org.greenrobot.eventbus.ThreadMode
|
|
import org.greenrobot.eventbus.ThreadMode
|
|
@@ -114,21 +115,26 @@ open class BaseActivity : AppCompatActivity() {
|
|
issuedBy, issuedFor, validFrom, validUntil
|
|
issuedBy, issuedFor, validFrom, validUntil
|
|
)
|
|
)
|
|
|
|
|
|
- LovelyStandardDialog(this)
|
|
|
|
- .setTopColorRes(R.color.nc_darkRed)
|
|
|
|
- .setNegativeButtonColorRes(R.color.nc_darkRed)
|
|
|
|
- .setPositiveButtonColor(viewThemeUtils.getScheme(this).primary)
|
|
|
|
- .setIcon(R.drawable.ic_security_white_24dp)
|
|
|
|
|
|
+ val dialogBuilder = MaterialAlertDialogBuilder(this)
|
|
|
|
+ .setIcon(viewThemeUtils.colorMaterialAlertDialogIcon(context, R.drawable.ic_security_white_24dp))
|
|
.setTitle(R.string.nc_certificate_dialog_title)
|
|
.setTitle(R.string.nc_certificate_dialog_title)
|
|
.setMessage(dialogText)
|
|
.setMessage(dialogText)
|
|
- .setPositiveButton(R.string.nc_yes) { v ->
|
|
|
|
|
|
+ .setPositiveButton(R.string.nc_yes) { _, _ ->
|
|
magicTrustManager.addCertInTrustStore(cert)
|
|
magicTrustManager.addCertInTrustStore(cert)
|
|
sslErrorHandler?.proceed()
|
|
sslErrorHandler?.proceed()
|
|
}
|
|
}
|
|
- .setNegativeButton(R.string.nc_no) { view1 ->
|
|
|
|
|
|
+ .setNegativeButton(R.string.nc_no) { _, _ ->
|
|
sslErrorHandler?.cancel()
|
|
sslErrorHandler?.cancel()
|
|
}
|
|
}
|
|
- .show()
|
|
|
|
|
|
+
|
|
|
|
+ viewThemeUtils.colorMaterialAlertDialogBackground(context, dialogBuilder)
|
|
|
|
+
|
|
|
|
+ val dialog = dialogBuilder.show()
|
|
|
|
+
|
|
|
|
+ viewThemeUtils.colorTextButtons(
|
|
|
|
+ dialog.getButton(AlertDialog.BUTTON_POSITIVE),
|
|
|
|
+ dialog.getButton(AlertDialog.BUTTON_NEGATIVE)
|
|
|
|
+ )
|
|
} catch (e: CertificateParsingException) {
|
|
} catch (e: CertificateParsingException) {
|
|
Log.d(TAG, "Failed to parse the certificate")
|
|
Log.d(TAG, "Failed to parse the certificate")
|
|
}
|
|
}
|