From b8df744c899cd4b7a50c7f079f4efe5ee3f0229f Mon Sep 17 00:00:00 2001
From: Mygod <contact-git@mygod.be>
Date: Tue, 1 Jun 2021 09:32:14 +0800
Subject: [PATCH] Fix this overriding again

---
 mobile/build.gradle.kts                                     | 2 +-
 mobile/src/main/AndroidManifest.xml                         | 6 +++---
 .../mygod/vpnhotspot/net/wifi/SoftApConfigurationCompat.kt  | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/mobile/build.gradle.kts b/mobile/build.gradle.kts
index 6524a422..2c768553 100644
--- a/mobile/build.gradle.kts
+++ b/mobile/build.gradle.kts
@@ -24,7 +24,7 @@ android {
         minSdk = 21
         if (targetSdk == 31) targetSdkPreview = "S" else this.targetSdk = targetSdk
         resourceConfigurations.addAll(arrayOf("it", "ru", "zh-rCN", "zh-rTW"))
-        versionCode = 270
+        versionCode = 271
         versionName = "2.12.0"
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         javaCompileOptions.annotationProcessorOptions.arguments.apply {
diff --git a/mobile/src/main/AndroidManifest.xml b/mobile/src/main/AndroidManifest.xml
index e694330c..e4fa8a08 100644
--- a/mobile/src/main/AndroidManifest.xml
+++ b/mobile/src/main/AndroidManifest.xml
@@ -9,9 +9,6 @@
     <uses-feature
         android:name="android.hardware.ethernet"
         android:required="false"/>
-    <uses-feature
-        android:name="android.software.leanback"
-        android:required="false"/>
     <uses-feature
         android:name="android.hardware.touchscreen"
         android:required="false"/>
@@ -24,6 +21,9 @@
     <uses-feature
         android:name="android.hardware.wifi.direct"
         android:required="false"/>
+    <uses-feature
+        android:name="android.software.leanback"
+        android:required="false"/>
 
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
diff --git a/mobile/src/main/java/be/mygod/vpnhotspot/net/wifi/SoftApConfigurationCompat.kt b/mobile/src/main/java/be/mygod/vpnhotspot/net/wifi/SoftApConfigurationCompat.kt
index 657a9090..4e06acae 100644
--- a/mobile/src/main/java/be/mygod/vpnhotspot/net/wifi/SoftApConfigurationCompat.kt
+++ b/mobile/src/main/java/be/mygod/vpnhotspot/net/wifi/SoftApConfigurationCompat.kt
@@ -318,8 +318,8 @@ data class SoftApConfigurationCompat(
                 bssid?.toCompat()?.addr,
                 passphrase,
                 isHiddenSsid,
-                if (BuildCompat.isAtLeastS()) getChannels(this) as SparseIntArray else SparseIntArray(1).apply {
-                    append(getBand(this) as Int, getChannel(this) as Int)
+                if (BuildCompat.isAtLeastS()) getChannels(this) as SparseIntArray else SparseIntArray(1).also {
+                    it.append(getBand(this) as Int, getChannel(this) as Int)
                 },
                 securityType,
                 getMaxNumberOfClients(this) as Int,