Refactor update checker

app/src/main/java/org/koitharu/kotatsu/settings/AppUpdateChecker.kt

@@ -4,9 +4,9 @@ import android.annotation.SuppressLint
 import android.content.Context
 import android.content.Intent
 import android.content.pm.PackageManager
-import android.net.Uri
 import androidx.activity.ComponentActivity
 import androidx.annotation.MainThread
+import androidx.core.net.toUri
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
@@ -23,9 +23,6 @@ import org.koitharu.kotatsu.utils.ext.printStackTraceDebug
 import java.io.ByteArrayInputStream
 import java.io.InputStream
 import java.security.MessageDigest
-import java.security.NoSuchAlgorithmException
-import java.security.cert.CertificateEncodingException
-import java.security.cert.CertificateException
 import java.security.cert.CertificateFactory
 import java.security.cert.X509Certificate
 import java.util.concurrent.TimeUnit
@@ -74,7 +71,8 @@ class AppUpdateChecker(private val activity: ComponentActivity) {
 			.setTitle(R.string.app_update_available)
 			.setMessage(message)
 			.setPositiveButton(R.string.download) { _, _ ->
-				activity.startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(version.apkUrl)))
+				val intent = Intent(Intent.ACTION_VIEW, version.apkUrl.toUri())
+				activity.startActivity(Intent.createChooser(intent, activity.getString(R.string.open_in_browser)))
 			}
 			.setNegativeButton(R.string.close, null)
 			.setCancelable(false)
@@ -88,42 +86,23 @@ class AppUpdateChecker(private val activity: ComponentActivity) {
 		private val PERIOD = TimeUnit.HOURS.toMillis(6)
 
 		fun isUpdateSupported(context: Context): Boolean {
-			return getCertificateSHA1Fingerprint(context) == CERT_SHA1
+			return BuildConfig.DEBUG || getCertificateSHA1Fingerprint(context) == CERT_SHA1
 		}
 
 		@Suppress("DEPRECATION")
 		@SuppressLint("PackageManagerGetSignatures")
-		private fun getCertificateSHA1Fingerprint(context: Context): String? {
+		private fun getCertificateSHA1Fingerprint(context: Context): String? = runCatching {
-			val packageInfo = try {
+			val packageInfo = context.packageManager.getPackageInfo(context.packageName, PackageManager.GET_SIGNATURES)
-				context.packageManager.getPackageInfo(
+			val signatures = requireNotNull(packageInfo?.signatures)
-					context.packageName,
+			val cert: ByteArray = signatures.first().toByteArray()
-					PackageManager.GET_SIGNATURES
-				)
-			} catch (e: PackageManager.NameNotFoundException) {
-				e.printStackTraceDebug()
-				return null
-			}
-			val signatures = packageInfo?.signatures
-			val cert: ByteArray = signatures?.firstOrNull()?.toByteArray() ?: return null
 			val input: InputStream = ByteArrayInputStream(cert)
-			val c = try {
+			val cf = CertificateFactory.getInstance("X509")
-				val cf = CertificateFactory.getInstance("X509")
+			val c = cf.generateCertificate(input) as X509Certificate
-				cf.generateCertificate(input) as X509Certificate
+			val md: MessageDigest = MessageDigest.getInstance("SHA1")
-			} catch (e: CertificateException) {
+			val publicKey: ByteArray = md.digest(c.encoded)
-				e.printStackTraceDebug()
+			return publicKey.byte2HexFormatted()
-				return null
+		}.onFailure { error ->
-			}
+			error.printStackTraceDebug()
-			return try {
+		}.getOrNull()
-				val md: MessageDigest = MessageDigest.getInstance("SHA1")
-				val publicKey: ByteArray = md.digest(c.encoded)
-				publicKey.byte2HexFormatted()
-			} catch (e: NoSuchAlgorithmException) {
-				e.printStackTraceDebug()
-				null
-			} catch (e: CertificateEncodingException) {
-				e.printStackTraceDebug()
-				null
-			}
-		}
 	}
 }