Merge pull request #36 from WiMank/ref-code-and-style

Refactor: Use Android KTX extensions

Author: pimterry

app/src/main/java/tech/httptoolkit/android/ConnectionStatusView.kt

@@ -10,6 +10,7 @@ import android.widget.LinearLayout
 import android.widget.TextView
 import com.google.android.material.card.MaterialCardView
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import androidx.core.net.toUri
 
 private val isLineageOs = Build.HOST.startsWith("lineage")
 
@@ -71,7 +72,7 @@ class ConnectionStatusView(
                     .setPositiveButton("View the bug") { _, _ ->
                         context.startActivity(Intent(
                             Intent.ACTION_VIEW,
-                            Uri.parse("https://gitlab.com/LineageOS/issues/android/-/issues/1706")
+                            "https://gitlab.com/LineageOS/issues/android/-/issues/1706".toUri()
                         ))
                     }
                     .show()
@@ -104,4 +105,4 @@ class ConnectionStatusView(
         )
     }
 
-}
+}

app/src/main/java/tech/httptoolkit/android/HttpToolkitApplication.kt

@@ -1,13 +1,16 @@
 package tech.httptoolkit.android
 
 import android.app.Application
-import android.content.*
+import android.content.Context
+import android.content.SharedPreferences
 import android.content.pm.PackageManager
 import android.os.Build
 import android.util.Log
+import androidx.core.content.edit
 import com.android.installreferrer.api.InstallReferrerClient
 import com.android.installreferrer.api.InstallReferrerClient.InstallReferrerResponse
 import com.android.installreferrer.api.InstallReferrerStateListener
+import com.beust.klaxon.Json
 import com.beust.klaxon.Klaxon
 import io.sentry.Sentry
 import kotlinx.coroutines.Dispatchers
@@ -16,7 +19,9 @@ import net.swiftzer.semver.SemVer
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import java.text.SimpleDateFormat
-import java.util.*
+import java.util.Calendar
+import java.util.Date
+import java.util.Locale
 import java.util.concurrent.atomic.AtomicBoolean
 import kotlin.coroutines.resume
 import kotlin.coroutines.suspendCoroutine
@@ -25,19 +30,22 @@ private const val VPN_START_TIME_PREF = "vpn-start-time"
 private const val LAST_UPDATE_CHECK_TIME_PREF = "update-check-time"
 private const val APP_CRASHED_PREF = "app-crashed"
 private const val FIRST_RUN_PREF = "is-first-run"
+private const val HTTP_TOOLKIT_PREFERENCES_NAME = "tech.httptoolkit.android"
+private const val LAST_PROXY_CONFIG_PREF_KEY = "last-proxy-config"
+private const val TIME_PATTERN = "yyyy-MM-dd'T'HH:mm:ss"
 
 private val isProbablyEmulator =
-        Build.FINGERPRINT.startsWith("generic")
-        || Build.FINGERPRINT.startsWith("unknown")
-        || Build.MODEL.contains("google_sdk")
-        || Build.MODEL.contains("sdk_gphone")
-        || Build.MODEL.contains("Emulator")
-        || Build.MODEL.contains("Android SDK built for x86")
-        || Build.BOARD == "QC_Reference_Phone"
-        || Build.MANUFACTURER.contains("Genymotion")
-        || Build.HOST.startsWith("Build")
-        || (Build.BRAND.startsWith("generic") && Build.DEVICE.startsWith("generic"))
-        || Build.PRODUCT == "google_sdk"
+    Build.FINGERPRINT.startsWith("generic")
+            || Build.FINGERPRINT.startsWith("unknown")
+            || Build.MODEL.contains("google_sdk")
+            || Build.MODEL.contains("sdk_gphone")
+            || Build.MODEL.contains("Emulator")
+            || Build.MODEL.contains("Android SDK built for x86")
+            || Build.BOARD == "QC_Reference_Phone"
+            || Build.MANUFACTURER.contains("Genymotion")
+            || Build.HOST.startsWith("Build")
+            || (Build.BRAND.startsWith("generic") && Build.DEVICE.startsWith("generic"))
+            || Build.PRODUCT == "google_sdk"
 
 private val bootTime = (System.currentTimeMillis() - android.os.SystemClock.elapsedRealtime())
 
@@ -52,23 +60,23 @@ class HttpToolkitApplication : Application() {
         }
         set(value) {
             if (value) {
-                prefs.edit().putLong(VPN_START_TIME_PREF, System.currentTimeMillis()).apply()
+                prefs.edit { putLong(VPN_START_TIME_PREF, System.currentTimeMillis()) }
             } else {
-                prefs.edit().putLong(VPN_START_TIME_PREF, -1).apply()
+                prefs.edit { putLong(VPN_START_TIME_PREF, -1) }
             }
         }
 
     override fun onCreate() {
         super.onCreate()
-        prefs = getSharedPreferences("tech.httptoolkit.android", MODE_PRIVATE)
+        prefs = getSharedPreferences(HTTP_TOOLKIT_PREFERENCES_NAME, MODE_PRIVATE)
 
         Thread.setDefaultUncaughtExceptionHandler { _, _ ->
-            prefs.edit().putBoolean(APP_CRASHED_PREF, true).apply()
+            prefs.edit { putBoolean(APP_CRASHED_PREF, true) }
         }
 
         // Check if we've been recreated unexpectedly, with no crashes in the meantime:
         val appCrashed = prefs.getBoolean(APP_CRASHED_PREF, false)
-        prefs.edit().putBoolean(APP_CRASHED_PREF, false).apply()
+        prefs.edit { putBoolean(APP_CRASHED_PREF, false) }
 
         vpnWasKilled = vpnShouldBeRunning && !isVpnActive() && !appCrashed && !isProbablyEmulator
         if (vpnWasKilled) {
@@ -94,10 +102,10 @@ class HttpToolkitApplication : Application() {
     /**
      * Grab any first run params, drop them for future usage, and return them.
      * This will return first-run params at most once (per install).
-      */
+     */
     suspend fun popFirstRunParams(): String? {
         val isFirstRun = prefs.getBoolean(FIRST_RUN_PREF, true)
-        prefs.edit().putBoolean(FIRST_RUN_PREF, false).apply()
+        prefs.edit { putBoolean(FIRST_RUN_PREF, false) }
 
         val installTime = packageManager.getPackageInfo(packageName, 0).firstInstallTime
         val now = System.currentTimeMillis()
@@ -128,6 +136,7 @@ class HttpToolkitApplication : Application() {
                             Log.i(TAG, "Returning first run referrer: $referrer")
                             resume(referrer)
                         }
+
                         else -> {
                             Log.w(TAG, "Couldn't get install referrer, skipping: $responseCode")
                             resume(null)
@@ -146,14 +155,15 @@ class HttpToolkitApplication : Application() {
     var lastProxy: ProxyConfig?
         get() {
             Log.i(TAG, "Loading last proxy config")
-            val prefs = getSharedPreferences("tech.httptoolkit.android", MODE_PRIVATE)
-            val serialized = prefs.getString("last-proxy-config", null)
+            val prefs = getSharedPreferences(HTTP_TOOLKIT_PREFERENCES_NAME, MODE_PRIVATE)
+            val serialized = prefs.getString(LAST_PROXY_CONFIG_PREF_KEY, null)
 
             return when {
                 serialized != null -> {
                     Log.i(TAG, "Found last proxy config: $serialized")
                     Klaxon().converter(CertificateConverter).parse<ProxyConfig>(serialized)
                 }
+
                 else -> {
                     Log.i(TAG, "No proxy config found")
                     null
@@ -162,19 +172,19 @@ class HttpToolkitApplication : Application() {
         }
         set(proxyConfig) {
             Log.i(TAG, if (proxyConfig == null) "Clearing proxy config" else "Saving proxy config")
-            val prefs = getSharedPreferences("tech.httptoolkit.android", MODE_PRIVATE)
+            val prefs = getSharedPreferences(HTTP_TOOLKIT_PREFERENCES_NAME, MODE_PRIVATE)
 
             if (proxyConfig != null) {
                 val serialized = Klaxon().converter(CertificateConverter).toJsonString(proxyConfig)
-                prefs.edit().putString("last-proxy-config", serialized).apply()
+                prefs.edit { putString(LAST_PROXY_CONFIG_PREF_KEY, serialized) }
             } else {
-                prefs.edit().remove("last-proxy-config").apply()
+                prefs.edit { remove(LAST_PROXY_CONFIG_PREF_KEY) }
             }
         }
 
     var uninterceptedApps: Set<String>
         get() {
-            val prefs = getSharedPreferences("tech.httptoolkit.android", MODE_PRIVATE)
+            val prefs = getSharedPreferences(HTTP_TOOLKIT_PREFERENCES_NAME, MODE_PRIVATE)
             val packagesSet = prefs.getStringSet("unintercepted-packages", null)
             val allPackages = packageManager.getInstalledPackages(PackageManager.GET_META_DATA)
                 .map { pkg -> pkg.packageName }
@@ -183,20 +193,20 @@ class HttpToolkitApplication : Application() {
                 .toSet()
         }
         set(packageNames) {
-            val prefs = getSharedPreferences("tech.httptoolkit.android", MODE_PRIVATE)
-            prefs.edit().putStringSet("unintercepted-packages", packageNames).apply()
+            val prefs = getSharedPreferences(HTTP_TOOLKIT_PREFERENCES_NAME, MODE_PRIVATE)
+            prefs.edit { putStringSet("unintercepted-packages", packageNames) }
         }
 
     var interceptedPorts: Set<Int>
         get() {
-            val prefs = getSharedPreferences("tech.httptoolkit.android", MODE_PRIVATE)
+            val prefs = getSharedPreferences(HTTP_TOOLKIT_PREFERENCES_NAME, MODE_PRIVATE)
             val portsSet = prefs.getStringSet("intercepted-ports", null)
             return portsSet?.map(String::toInt)?.toSortedSet()
                 ?: DEFAULT_PORTS
         }
         set(ports) {
-            val prefs = getSharedPreferences("tech.httptoolkit.android", MODE_PRIVATE)
-            prefs.edit().putStringSet("intercepted-ports", ports.map(Int::toString).toSet()).apply()
+            val prefs = getSharedPreferences(HTTP_TOOLKIT_PREFERENCES_NAME, MODE_PRIVATE)
+            prefs.edit { putStringSet("intercepted-ports", ports.map(Int::toString).toSet()) }
         }
 
     suspend fun isUpdateRequired(): Boolean {
@@ -208,7 +218,8 @@ class HttpToolkitApplication : Application() {
                 return@withContext false
             }
 
-            val lastUpdateTime = prefs.getLong(LAST_UPDATE_CHECK_TIME_PREF,
+            val lastUpdateTime = prefs.getLong(
+                LAST_UPDATE_CHECK_TIME_PREF,
                 firstInstallTime(this@HttpToolkitApplication)
             )
 
@@ -230,9 +241,11 @@ class HttpToolkitApplication : Application() {
                 val release = Klaxon().parse<GithubRelease>(response)!!
                 val releaseVersion =
                     tryParseSemver(release.name)
-                    ?: tryParseSemver(release.tag_name)
-                    ?: throw RuntimeException("Could not parse release version ${release.tag_name}")
-                val releaseDate = SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss").parse(release.published_at)!!
+                        ?: tryParseSemver(release.tagName)
+                        ?: throw RuntimeException("Could not parse release version ${release.tagName}")
+
+                val releaseDate =
+                    SimpleDateFormat(TIME_PATTERN, Locale.getDefault()).parse(release.publishedAt)!!
 
                 val installedVersion = getInstalledVersion(this@HttpToolkitApplication)
 
@@ -242,7 +255,8 @@ class HttpToolkitApplication : Application() {
                 // series of releases. Better to start chasing users only after a week stable.
                 val updateNotTooRecent = releaseDate.before(daysAgo(7))
 
-                Log.i(TAG,
+                Log.i(
+                    TAG,
                     if (updateAvailable && updateNotTooRecent)
                         "New version available, released > 1 week"
                     else if (updateAvailable)
@@ -251,7 +265,7 @@ class HttpToolkitApplication : Application() {
                         "App is up to date"
                 )
 
-                prefs.edit().putLong(LAST_UPDATE_CHECK_TIME_PREF, System.currentTimeMillis()).apply()
+                prefs.edit { putLong(LAST_UPDATE_CHECK_TIME_PREF, System.currentTimeMillis()) }
                 return@withContext updateAvailable && updateNotTooRecent
             } catch (e: Exception) {
                 Log.w(TAG, e)
@@ -263,17 +277,24 @@ class HttpToolkitApplication : Application() {
 }
 
 private fun wasInstalledFromStore(context: Context): Boolean {
-    return context.packageManager.getInstallerPackageName(context.packageName) != null
+    return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+        context.packageManager.getInstallSourceInfo(context.packageName).installingPackageName != null
+    } else {
+        context.packageManager.getInstallerPackageName(context.packageName) != null
+    }
 }
 
 private fun firstInstallTime(context: Context): Long {
     return context.packageManager.getPackageInfo(context.packageName, 0).firstInstallTime
 }
 
 private data class GithubRelease(
-    val tag_name: String?,
+    @Json(name = "tag_name")
+    val tagName: String?,
+    @Json(name = "name")
     val name: String?,
-    val published_at: String
+    @Json(name = "published_at")
+    val publishedAt: String,
 )
 
 private fun tryParseSemver(version: String?): SemVer? = try {
@@ -296,4 +317,4 @@ private fun daysAgo(days: Int): Date {
     val calendar = Calendar.getInstance()
     calendar.add(Calendar.DAY_OF_YEAR, -days)
     return calendar.time
-}
+}

app/src/main/java/tech/httptoolkit/android/MainActivity.kt

@@ -39,6 +39,8 @@ import java.net.ConnectException
 import java.net.SocketTimeoutException
 import java.security.cert.Certificate
 import java.security.cert.X509Certificate
+import androidx.core.view.isVisible
+import androidx.core.net.toUri
 
 
 const val START_VPN_REQUEST = 123
@@ -373,7 +375,7 @@ class MainActivity : AppCompatActivity(), CoroutineScope by MainScope() {
             }
         }
 
-        if (buttonContainer.visibility == View.VISIBLE) {
+        if (buttonContainer.isVisible) {
             buttonContainer.addView(secondaryButton(R.string.docs_button, ::openDocs))
         }
     }
@@ -525,9 +527,7 @@ class MainActivity : AppCompatActivity(), CoroutineScope by MainScope() {
             startActivity(
                 Intent(
                     Intent.ACTION_VIEW,
-                    Uri.parse((
-                        if (canUseHttps) "https" else "http"
-                    ) + "://" + uri)
+                    ((if (canUseHttps) "https" else "http") + "://" + uri).toUri()
                 ).apply {
                     if (browserPackage != null) setPackage(browserPackage)
                 }
@@ -631,7 +631,7 @@ class MainActivity : AppCompatActivity(), CoroutineScope by MainScope() {
     }
 
     private suspend fun connectToVpnFromUrl(url: String) {
-        connectToVpnFromUrl(Uri.parse(url))
+        connectToVpnFromUrl(url.toUri())
     }
 
     private suspend fun connectToVpnFromUrl(uri: Uri) {
@@ -930,7 +930,7 @@ class MainActivity : AppCompatActivity(), CoroutineScope by MainScope() {
                     // it is imminent, and installing from play means it'll update fully later.
                     startActivity(
                         Intent(Intent.ACTION_VIEW).apply {
-                            data = Uri.parse("market://details?id=tech.httptoolkit.android.v1")
+                            data = "market://details?id=tech.httptoolkit.android.v1".toUri()
                         }
                     )
                 }
@@ -1036,7 +1036,7 @@ private fun isPackageAvailable(context: Context, packageName: String) = try {
 }
 
 private fun getDefaultBrowserPackage(context: Context): String? {
-    val browserIntent = Intent("android.intent.action.VIEW", Uri.parse("http://example.com"))
+    val browserIntent = Intent("android.intent.action.VIEW", "http://example.com".toUri())
     val resolveInfo = context.packageManager.resolveActivity(browserIntent, PackageManager.MATCH_DEFAULT_ONLY)
     return resolveInfo?.activityInfo?.packageName
 }
@@ -1068,4 +1068,4 @@ private fun getTestBrowserPackage(context: Context): String? {
 }
 
 private fun isStoreAvailable(context: Context): Boolean =
-    isPackageAvailable(context, GooglePlayServicesUtil.GOOGLE_PLAY_STORE_PACKAGE)
+    isPackageAvailable(context, GooglePlayServicesUtil.GOOGLE_PLAY_STORE_PACKAGE)