Merge pull request #32

Improve QR code flow & permissions, and update lots of assorted build config & Android API usage

Author: pimterry

app/build.gradle

@@ -0,0 +1,77 @@
+plugins {
+    alias(libs.plugins.android.application)
+    alias(libs.plugins.kotlin.android)
+    id("kotlin-parcelize")
+}
+
+android {
+    namespace = "tech.httptoolkit.android"
+    compileSdk =  35
+
+    defaultConfig {
+        applicationId = "tech.httptoolkit.android.v1"
+        minSdk = 21
+        targetSdk = 34
+        versionCode = 34
+        versionName = "1.5.0"
+
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+
+        manifestPlaceholders["sentryEnabled"] = "false"
+        manifestPlaceholders["sentryDsn"] = "null"
+    }
+
+    buildTypes {
+        release {
+            isMinifyEnabled = false
+            proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
+
+            manifestPlaceholders["sentryEnabled"] = "true"
+            manifestPlaceholders["sentryDsn"] = "https://6943ce7476d54485a5998ad45289a9bc@sentry.io/1809979"
+        }
+    }
+
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
+    }
+
+    kotlinOptions {
+        jvmTarget = "11"
+    }
+
+    buildFeatures {
+        viewBinding = true
+        buildConfig = true
+    }
+    lint {
+        lintConfig = file("./lint.xml")
+    }
+}
+
+dependencies {
+    implementation(fileTree(mapOf("dir" to "libs", "include" to listOf("*.jar"))))
+    implementation(libs.kotlin.stdlib.jdk7)
+    implementation(libs.kotlin.reflect)
+    implementation(libs.kotlinx.coroutines.core)
+    implementation(libs.kotlinx.coroutines.android)
+    implementation(libs.appcompat)
+    implementation(libs.core.ktx)
+    implementation(libs.constraintlayout)
+    implementation(libs.localbroadcastmanager)
+    implementation(libs.zxing.android.embedded) { isTransitive = false }
+    implementation(libs.core)
+    implementation(libs.klaxon)
+    implementation(libs.okhttp)
+    implementation(libs.material)
+    implementation(libs.semver)
+    implementation(libs.sentry.android)
+    implementation(libs.slf4j.nop)
+    implementation(libs.play.services.base)
+    implementation(libs.installreferrer)
+    implementation(libs.swiperefreshlayout)
+    testImplementation(libs.junit)
+    androidTestImplementation(libs.runner)
+    androidTestImplementation(libs.espresso.core)
+}

app/build.gradle.kts

@@ -32,6 +32,7 @@
     <application
             android:name=".HttpToolkitApplication"
             android:allowBackup="true"
+            android:hardwareAccelerated="true"
             android:icon="@mipmap/ic_launcher"
             android:label="@string/app_name"
             android:roundIcon="@mipmap/ic_launcher_round"
@@ -100,7 +101,7 @@
             </intent-filter>
         </activity-alias>
 
-        <activity android:name=".ScanActivity" android:parentActivityName=".MainActivity">
+        <activity android:name=".QRScanActivity" android:parentActivityName=".MainActivity">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value=".MainActivity" />

app/src/main/AndroidManifest.xml

@@ -16,10 +16,6 @@ import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
 import kotlinx.coroutines.*
 import tech.httptoolkit.android.databinding.AppsListBinding
 import java.util.*
-import kotlin.collections.ArrayList
-
-// Used to both to send and return the current list of selected apps
-const val UNSELECTED_APPS_EXTRA = "tech.httptoolkit.android.UNSELECTED_APPS_EXTRA"
 
 class ApplicationListActivity : AppCompatActivity(), SwipeRefreshLayout.OnRefreshListener,
     CoroutineScope by MainScope(), PopupMenu.OnMenuItemClickListener, View.OnClickListener {
@@ -38,8 +34,7 @@ class ApplicationListActivity : AppCompatActivity(), SwipeRefreshLayout.OnRefres
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
-        blockedPackages = intent.getStringArrayExtra(UNSELECTED_APPS_EXTRA)!!.toHashSet()
-
+        blockedPackages = intent.getStringArrayExtra(IntentExtras.UNSELECTED_APPS_EXTRA)!!.toHashSet()
         binding = AppsListBinding.inflate(layoutInflater)
         setContentView(binding.root)
 
@@ -60,7 +55,7 @@ class ApplicationListActivity : AppCompatActivity(), SwipeRefreshLayout.OnRefres
         onBackPressedDispatcher.addCallback(this, object : OnBackPressedCallback(true) {
             override fun handleOnBackPressed() {
                 setResult(RESULT_OK, Intent().putExtra(
-                    UNSELECTED_APPS_EXTRA,
+                    IntentExtras.UNSELECTED_APPS_EXTRA,
                     blockedPackages.toTypedArray()
                 ))
                 finish()

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

@@ -0,0 +1,10 @@
+package tech.httptoolkit.android
+
+object IntentExtras {
+    const val SCANNED_URL_EXTRA = "tech.httptoolkit.android.SCANNED_URL"
+    const val SELECTED_PORTS_EXTRA = "tech.httptoolkit.android.SELECTED_PORTS_EXTRA"
+    const val UNSELECTED_APPS_EXTRA = "tech.httptoolkit.android.UNSELECTED_APPS_EXTRA"
+    const val PROXY_CONFIG_EXTRA = "tech.httptoolkit.android.PROXY_CONFIG"
+    const val UNINTERCEPTED_APPS_EXTRA = "tech.httptoolkit.android.UNINTERCEPTED_APPS"
+    const val INTERCEPTED_PORTS_EXTRA = "tech.httptoolkit.android.INTERCEPTED_PORTS"
+}