From 85060220b4d5ca49ff56c4e366765682aa459769 Mon Sep 17 00:00:00 2001
From: Mygod <contact-git@mygod.be>
Date: Mon, 11 Jul 2022 16:01:19 -0400
Subject: [PATCH] Compile against Tiramisu

---
 mobile/build.gradle.kts                                   | 8 ++++----
 .../java/be/mygod/vpnhotspot/manage/TetheringFragment.kt  | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/mobile/build.gradle.kts b/mobile/build.gradle.kts
index 21c49209..fecbd72b 100644
--- a/mobile/build.gradle.kts
+++ b/mobile/build.gradle.kts
@@ -10,13 +10,13 @@ plugins {
 
 android {
     val javaVersion = JavaVersion.VERSION_11
-    buildToolsVersion = "32.0.0"
+    buildToolsVersion = "33.0.0"
     compileOptions {
         isCoreLibraryDesugaringEnabled = true
         sourceCompatibility = javaVersion
         targetCompatibility = javaVersion
     }
-    compileSdk = 32
+    compileSdk = 33
     kotlinOptions.jvmTarget = javaVersion.toString()
     defaultConfig {
         applicationId = "be.mygod.vpnhotspot"
@@ -57,10 +57,10 @@ android {
         }
         create("google") {
             dimension = "freedom"
-            targetSdk = 32
+            targetSdk = 33
             versionNameSuffix = "-g"
             buildConfigField("boolean", "DONATIONS", "false")
-            buildConfigField("int", "TARGET_SDK", "32")
+            buildConfigField("int", "TARGET_SDK", "33")
         }
     }
     sourceSets.getByName("androidTest").assets.srcDir("$projectDir/schemas")
diff --git a/mobile/src/main/java/be/mygod/vpnhotspot/manage/TetheringFragment.kt b/mobile/src/main/java/be/mygod/vpnhotspot/manage/TetheringFragment.kt
index a74f45e7..a58da05e 100644
--- a/mobile/src/main/java/be/mygod/vpnhotspot/manage/TetheringFragment.kt
+++ b/mobile/src/main/java/be/mygod/vpnhotspot/manage/TetheringFragment.kt
@@ -166,7 +166,7 @@ class TetheringFragment : Fragment(), ServiceConnection, Toolbar.OnMenuItemClick
         val activity = activity as? MainActivity
         val item = activity?.binding?.toolbar?.menu?.findItem(R.id.monitor) ?: return   // assuming no longer foreground
         item.isNotGone = canMonitor.isNotEmpty()
-        item.subMenu.apply {
+        item.subMenu!!.apply {
             clear()
             for (iface in canMonitor.sorted()) add(iface).setOnMenuItemClickListener {
                 ContextCompat.startForegroundService(activity, Intent(activity, TetheringService::class.java)
@@ -179,7 +179,7 @@ class TetheringFragment : Fragment(), ServiceConnection, Toolbar.OnMenuItemClick
     private var apConfigurationRunning = false
     override fun onMenuItemClick(item: MenuItem?): Boolean {
         return when (item?.itemId) {
-            R.id.configuration -> item.subMenu.run {
+            R.id.configuration -> item.subMenu!!.run {
                 findItem(R.id.configuration_repeater).isNotGone = Services.p2p != null
                 findItem(R.id.configuration_temp_hotspot).isNotGone =
                         Build.VERSION.SDK_INT >= 26 && adapter.localOnlyHotspotManager.binder?.configuration != null