brianhansonxyz/vpnhotspotmod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compile against Tiramisu

Browse Source
This commit is contained in:
Mygod
2022-07-11 16:01:19 -04:00
parent be22c18182
commit 85060220b4
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mobile/build.gradle.kts
View File

@@ -10,13 +10,13 @@ plugins {
android { android {
val javaVersion = JavaVersion.VERSION_11 val javaVersion = JavaVersion.VERSION_11
buildToolsVersion = "32.0.0" buildToolsVersion = "33.0.0"
compileOptions { compileOptions {
isCoreLibraryDesugaringEnabled = true isCoreLibraryDesugaringEnabled = true
sourceCompatibility = javaVersion sourceCompatibility = javaVersion
targetCompatibility = javaVersion targetCompatibility = javaVersion
} }
compileSdk = 32 compileSdk = 33
kotlinOptions.jvmTarget = javaVersion.toString() kotlinOptions.jvmTarget = javaVersion.toString()
defaultConfig { defaultConfig {
applicationId = "be.mygod.vpnhotspot" applicationId = "be.mygod.vpnhotspot"
@@ -57,10 +57,10 @@ android {
} }
create("google") { create("google") {
dimension = "freedom" dimension = "freedom"
targetSdk = 32 targetSdk = 33
versionNameSuffix = "-g" versionNameSuffix = "-g"
buildConfigField("boolean", "DONATIONS", "false") buildConfigField("boolean", "DONATIONS", "false")
buildConfigField("int", "TARGET_SDK", "32") buildConfigField("int", "TARGET_SDK", "33")
} }
} }
sourceSets.getByName("androidTest").assets.srcDir("$projectDir/schemas") sourceSets.getByName("androidTest").assets.srcDir("$projectDir/schemas")

4
mobile/src/main/java/be/mygod/vpnhotspot/manage/TetheringFragment.kt
View File

@@ -166,7 +166,7 @@ class TetheringFragment : Fragment(), ServiceConnection, Toolbar.OnMenuItemClick
val activity = activity as? MainActivity val activity = activity as? MainActivity
val item = activity?.binding?.toolbar?.menu?.findItem(R.id.monitor) ?: return // assuming no longer foreground val item = activity?.binding?.toolbar?.menu?.findItem(R.id.monitor) ?: return // assuming no longer foreground
item.isNotGone = canMonitor.isNotEmpty() item.isNotGone = canMonitor.isNotEmpty()
item.subMenu.apply { item.subMenu!!.apply {
clear() clear()
for (iface in canMonitor.sorted()) add(iface).setOnMenuItemClickListener { for (iface in canMonitor.sorted()) add(iface).setOnMenuItemClickListener {
ContextCompat.startForegroundService(activity, Intent(activity, TetheringService::class.java) ContextCompat.startForegroundService(activity, Intent(activity, TetheringService::class.java)
@@ -179,7 +179,7 @@ class TetheringFragment : Fragment(), ServiceConnection, Toolbar.OnMenuItemClick
private var apConfigurationRunning = false private var apConfigurationRunning = false
override fun onMenuItemClick(item: MenuItem?): Boolean { override fun onMenuItemClick(item: MenuItem?): Boolean {
return when (item?.itemId) { 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_repeater).isNotGone = Services.p2p != null
findItem(R.id.configuration_temp_hotspot).isNotGone = findItem(R.id.configuration_temp_hotspot).isNotGone =
Build.VERSION.SDK_INT >= 26 && adapter.localOnlyHotspotManager.binder?.configuration != null Build.VERSION.SDK_INT >= 26 && adapter.localOnlyHotspotManager.binder?.configuration != null