support API 33; minimum API 23;

Author: VREMSoftwareDevelopment

app/build.gradle

@@ -27,12 +27,13 @@ dependencies {
     // Compile Build Dependencies
     implementation fileTree(include: ["*.jar"], dir: "libs")
     implementation 'com.google.android.material:material:1.6.1'
-    implementation 'androidx.annotation:annotation:1.4.0'
-    implementation 'androidx.appcompat:appcompat:1.4.2'
+    implementation 'androidx.annotation:annotation:1.5.0'
+    implementation 'androidx.appcompat:appcompat:1.5.1'
     implementation 'androidx.collection:collection-ktx:1.2.0'
-    implementation 'androidx.core:core-ktx:1.8.0'
-    implementation 'androidx.core:core-splashscreen:1.0.0-rc01'
+    implementation 'androidx.core:core-ktx:1.9.0'
+    implementation 'androidx.core:core-splashscreen:1.0.0'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
+    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1"
     implementation 'androidx.media:media:1.6.0'
     implementation 'androidx.preference:preference-ktx:1.2.0'
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
@@ -41,10 +42,10 @@ dependencies {
     testImplementation 'androidx.test.ext:junit:1.1.3'
     testImplementation 'com.googlecode.junit-toolbox:junit-toolbox:2.4'
     testImplementation 'com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0'
-    testImplementation 'io.mockk:mockk:1.12.4'
+    testImplementation 'io.mockk:mockk:1.13.1'
     testImplementation 'junit:junit:4.13.2'
-    testImplementation 'org.mockito:mockito-core:4.6.1'
-    testImplementation 'org.robolectric:robolectric:4.8.1'
+    testImplementation 'org.mockito:mockito-core:4.8.0'
+    testImplementation 'org.robolectric:robolectric:4.9-alpha-1'
     testImplementation "org.jetbrains.kotlin:kotlin-test:$kotlin_version"
     testImplementation "org.jetbrains.kotlin:kotlin-test-junit:$kotlin_version"
     // Android Test Dependencies
@@ -54,7 +55,7 @@ dependencies {
 
 android {
     namespace 'com.vrem.wifianalyzer'
-    compileSdkVersion 31
+    compileSdkVersion 33
     buildToolsVersion '33.0.0'
 
     sourceSets.each {
@@ -63,8 +64,8 @@ android {
 
     defaultConfig {
         applicationId "com.vrem.wifianalyzer"
-        minSdkVersion 21
-        targetSdkVersion 31
+        minSdkVersion 23
+        targetSdkVersion 33
         versionCode
         versionName
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

app/build.properties

@@ -1,7 +1,7 @@
 #Build Properties
-#Sat Jun 25 08:43:59 EDT 2022
+#Tue Sep 27 10:54:09 EDT 2022
 version_minor=0
 version_store=61
 version_patch=9
-version_build=0
+version_build=1
 version_major=3

app/src/main/kotlin/com/vrem/util/BuildUtils.kt

@@ -20,6 +20,10 @@ package com.vrem.util
 
 import android.os.Build
 
+fun buildMinVersionT(): Boolean = Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU
+
+fun buildMinVersionS(): Boolean = Build.VERSION.SDK_INT >= Build.VERSION_CODES.S
+
 fun buildMinVersionR(): Boolean = Build.VERSION.SDK_INT >= Build.VERSION_CODES.R
 
 fun buildMinVersionQ(): Boolean = Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q
@@ -29,5 +33,3 @@ fun buildMinVersionP(): Boolean = Build.VERSION.SDK_INT >= Build.VERSION_CODES.P
 fun buildVersionP(): Boolean = Build.VERSION.SDK_INT == Build.VERSION_CODES.P
 
 fun buildMinVersionN(): Boolean = Build.VERSION.SDK_INT >= Build.VERSION_CODES.N
-
-fun buildMinVersionM(): Boolean = Build.VERSION.SDK_INT >= Build.VERSION_CODES.M

app/src/main/kotlin/com/vrem/util/CompatUtils.kt

@@ -19,12 +19,12 @@ package com.vrem.util
 
 import android.annotation.TargetApi
 import android.content.Context
+import android.content.pm.PackageInfo
+import android.content.pm.PackageManager.PackageInfoFlags
 import android.content.res.Configuration
 import android.content.res.Resources
+import android.net.wifi.ScanResult
 import android.os.Build
-import androidx.annotation.ColorInt
-import androidx.annotation.ColorRes
-import androidx.core.content.ContextCompat
 import java.util.*
 
 fun Context.createContext(newLocale: Locale): Context =
@@ -51,10 +51,32 @@ private fun Context.createContextLegacy(newLocale: Locale): Context {
     return this
 }
 
-@ColorInt
-fun Context.compatColor(@ColorRes id: Int): Int =
-    if (buildMinVersionM()) {
-        getColor(id)
+fun Context.packageInfo(): PackageInfo =
+    if (buildMinVersionT()) {
+        packageInfoAndroidT()
     } else {
-        ContextCompat.getColor(this, id)
+        packageInfoLegacy()
     }
+
+@TargetApi(Build.VERSION_CODES.TIRAMISU)
+private fun Context.packageInfoAndroidT(): PackageInfo =
+    packageManager.getPackageInfo(packageName, PackageInfoFlags.of(0))
+
+@Suppress("DEPRECATION")
+private fun Context.packageInfoLegacy(): PackageInfo =
+    packageManager.getPackageInfo(packageName, 0)
+
+fun ScanResult.ssid(): String =
+    if (buildMinVersionT()) {
+        ssidAndroidT()
+    } else {
+        ssidLegacy()
+    }
+
+@TargetApi(Build.VERSION_CODES.TIRAMISU)
+private fun ScanResult.ssidAndroidT(): String =
+    wifiSsid?.toString() ?: String.EMPTY
+
+@Suppress("DEPRECATION")
+private fun ScanResult.ssidLegacy(): String =
+    if (SSID == null) String.EMPTY else SSID

app/src/main/kotlin/com/vrem/wifianalyzer/MainAcitvityBackPressed.kt

@@ -0,0 +1,35 @@
+/*
+ * WiFiAnalyzer
+ * Copyright (C) 2015 - 2022 VREM Software Development <[email protected]>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ */
+
+package com.vrem.wifianalyzer
+
+import androidx.activity.OnBackPressedCallback
+
+class MainActivityBackPressed(val mainActivity: MainActivity) : OnBackPressedCallback(true) {
+    override fun handleOnBackPressed() {
+        if (!mainActivity.closeDrawer()) {
+            val selectedMenu = MainContext.INSTANCE.settings.selectedMenu()
+            if (selectedMenu == mainActivity.currentNavigationMenu()) {
+                mainActivity.finish()
+            } else {
+                mainActivity.currentNavigationMenu(selectedMenu)
+                mainActivity.onNavigationItemSelected(mainActivity.currentMenuItem())
+            }
+        }
+    }
+}

app/src/main/kotlin/com/vrem/wifianalyzer/MainActivity.kt

@@ -89,6 +89,8 @@ class MainActivity : AppCompatActivity(), NavigationMenuControl, OnSharedPrefere
         connectionView = ConnectionView(this)
 
         permissionService = PermissionService(this)
+
+        onBackPressedDispatcher.addCallback(this, MainActivityBackPressed(this))
     }
 
     public override fun onPostCreate(savedInstanceState: Bundle?) {
@@ -142,26 +144,14 @@ class MainActivity : AppCompatActivity(), NavigationMenuControl, OnSharedPrefere
         updateActionBar()
     }
 
-    override fun onBackPressed() {
-        if (!closeDrawer()) {
-            val selectedMenu = MainContext.INSTANCE.settings.selectedMenu()
-            if (selectedMenu == currentNavigationMenu()) {
-                super.onBackPressed()
-            } else {
-                currentNavigationMenu(selectedMenu)
-                onNavigationItemSelected(currentMenuItem())
-            }
-        }
-    }
-
     override fun onNavigationItemSelected(menuItem: MenuItem): Boolean {
         closeDrawer()
         val currentNavigationMenu = findOne(NavigationMenu.values(), menuItem.itemId, NavigationMenu.ACCESS_POINTS)
         currentNavigationMenu.activateNavigationMenu(this, menuItem)
         return true
     }
 
-    private fun closeDrawer(): Boolean {
+    fun closeDrawer(): Boolean {
         val drawer = findViewById<DrawerLayout>(R.id.drawer_layout)
         if (drawer.isDrawerOpen(GravityCompat.START)) {
             drawer.closeDrawer(GravityCompat.START)

app/src/main/kotlin/com/vrem/wifianalyzer/about/AboutFragment.kt

@@ -35,6 +35,7 @@ import androidx.core.content.pm.PackageInfoCompat
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentActivity
 import com.vrem.util.EMPTY
+import com.vrem.util.packageInfo
 import com.vrem.util.readFile
 import com.vrem.wifianalyzer.MainContext
 import com.vrem.wifianalyzer.R
@@ -44,7 +45,7 @@ import java.util.*
 
 class AboutFragment : Fragment() {
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
         val binding: AboutContentBinding = AboutContentBinding.inflate(inflater, container, false)
         val activity: FragmentActivity = requireActivity()
         setTexts(binding, activity)
@@ -61,12 +62,20 @@ class AboutFragment : Fragment() {
     }
 
     private fun device(): String =
-            Build.MANUFACTURER + " - " + Build.BRAND + " - " + Build.MODEL
+        Build.MANUFACTURER + " - " + Build.BRAND + " - " + Build.MODEL
 
     private fun wiFiState(binding: AboutContentBinding) {
         val wiFiManagerWrapper = MainContext.INSTANCE.wiFiManagerWrapper
-        wiFiBand(wiFiManagerWrapper.is5GHzBandSupported(), binding.aboutWifiBand5ghzSuccess, binding.aboutWifiBand5ghzFails)
-        wiFiBand(wiFiManagerWrapper.is6GHzBandSupported(), binding.aboutWifiBand6ghzSuccess, binding.aboutWifiBand6ghzFails)
+        wiFiBand(
+            wiFiManagerWrapper.is5GHzBandSupported(),
+            binding.aboutWifiBand5ghzSuccess,
+            binding.aboutWifiBand5ghzFails
+        )
+        wiFiBand(
+            wiFiManagerWrapper.is6GHzBandSupported(),
+            binding.aboutWifiBand6ghzSuccess,
+            binding.aboutWifiBand6ghzFails
+        )
     }
 
     private fun wiFiBand(bandSupported: Boolean, aboutWifiBandSuccess: TextView, aboutWifiBandFails: TextView) {
@@ -82,7 +91,8 @@ class AboutFragment : Fragment() {
     private fun setOnClicks(binding: AboutContentBinding, activity: FragmentActivity) {
         val gpl = AlertDialogClickListener(activity, R.string.gpl, R.raw.gpl)
         binding.license.setOnClickListener(gpl)
-        val contributors = AlertDialogClickListener(activity, R.string.about_contributor_title, R.raw.contributors, false)
+        val contributors =
+            AlertDialogClickListener(activity, R.string.about_contributor_title, R.raw.contributors, false)
         binding.contributors.setOnClickListener(contributors)
         val al = AlertDialogClickListener(activity, R.string.al, R.raw.al)
         binding.graphViewLicense.setOnClickListener(al)
@@ -91,7 +101,7 @@ class AboutFragment : Fragment() {
     }
 
     private fun copyright(): String =
-            resources.getString(R.string.app_copyright) + SimpleDateFormat(YEAR_FORMAT, Locale.getDefault()).format(Date())
+        resources.getString(R.string.app_copyright) + SimpleDateFormat(YEAR_FORMAT, Locale.getDefault()).format(Date())
 
     private fun version(activity: FragmentActivity): String {
         val configuration = MainContext.INSTANCE.configuration
@@ -102,12 +112,13 @@ class AboutFragment : Fragment() {
     }
 
     private fun applicationVersion(activity: FragmentActivity): String =
-            try {
-                val packageInfo: PackageInfo = activity.packageManager.getPackageInfo(activity.packageName, 0)
-                packageInfo.versionName + " - " + PackageInfoCompat.getLongVersionCode(packageInfo)
-            } catch (e: NameNotFoundException) {
-                String.EMPTY
-            }
+        try {
+            val packageInfo: PackageInfo = activity.packageInfo()
+            packageInfo.versionName + " - " + PackageInfoCompat.getLongVersionCode(packageInfo)
+        } catch (e: NameNotFoundException) {
+            String.EMPTY
+        }
+
 
     private class WriteReviewClickListener(private val activity: Activity) : View.OnClickListener {
         override fun onClick(view: View) {
@@ -119,21 +130,22 @@ class AboutFragment : Fragment() {
                 Toast.makeText(view.context, e.localizedMessage, Toast.LENGTH_LONG).show()
             }
         }
-
     }
 
-    private class AlertDialogClickListener(private val activity: Activity,
-                                           private val titleId: Int,
-                                           private val resourceId: Int,
-                                           private val isSmallFont: Boolean = true) : View.OnClickListener {
+    private class AlertDialogClickListener(
+        private val activity: Activity,
+        private val titleId: Int,
+        private val resourceId: Int,
+        private val isSmallFont: Boolean = true
+    ) : View.OnClickListener {
         override fun onClick(view: View) {
             if (!activity.isFinishing) {
                 val text = readFile(activity.resources, resourceId)
                 val alertDialog: AlertDialog = AlertDialog.Builder(view.context)
-                        .setTitle(titleId)
-                        .setMessage(text)
-                        .setNeutralButton(android.R.string.ok) { dialog, _ -> dialog.dismiss() }
-                        .create()
+                    .setTitle(titleId)
+                    .setMessage(text)
+                    .setNeutralButton(android.R.string.ok) { dialog, _ -> dialog.dismiss() }
+                    .create()
                 alertDialog.show()
                 if (isSmallFont) {
                     alertDialog.findViewById<TextView>(android.R.id.message).textSize = 8f
@@ -143,11 +155,11 @@ class AboutFragment : Fragment() {
     }
 
     private fun ifElse(condition: Boolean, value: String) =
-            if (condition) {
-                value
-            } else {
-                String.EMPTY
-            }
+        if (condition) {
+            value
+        } else {
+            String.EMPTY
+        }
 
 
     companion object {

app/src/main/kotlin/com/vrem/wifianalyzer/navigation/availability/Filter.kt

@@ -17,7 +17,7 @@
  */
 package com.vrem.wifianalyzer.navigation.availability
 
-import com.vrem.util.compatColor
+import androidx.core.content.ContextCompat
 import com.vrem.wifianalyzer.MainContext
 import com.vrem.wifianalyzer.R
 
@@ -30,6 +30,6 @@ internal val navigationOptionFilterOn: NavigationOption = {
         val color = if (MainContext.INSTANCE.filtersAdapter.isActive()) R.color.selected else R.color.regular
         val menuItem = menu.findItem(R.id.action_filter)
         menuItem.isVisible = true
-        menuItem.icon.setTint(it.compatColor(color))
+        menuItem.icon?.setTint(ContextCompat.getColor(it, color))
     }
 }

app/src/main/kotlin/com/vrem/wifianalyzer/permission/ApplicationPermission.kt

@@ -18,15 +18,15 @@
 package com.vrem.wifianalyzer.permission
 
 import android.Manifest
-import android.annotation.TargetApi
 import android.app.Activity
 import android.content.pm.PackageManager
-import android.os.Build
 import com.vrem.annotation.OpenClass
-import com.vrem.util.buildMinVersionM
 
 @OpenClass
-class ApplicationPermission(private val activity: Activity, private val permissionDialog: PermissionDialog = PermissionDialog(activity)) {
+class ApplicationPermission(
+    private val activity: Activity,
+    private val permissionDialog: PermissionDialog = PermissionDialog(activity)
+) {
     fun check() {
         if (granted()) {
             return
@@ -38,13 +38,10 @@ class ApplicationPermission(private val activity: Activity, private val permissi
     }
 
     fun granted(requestCode: Int, grantResults: IntArray): Boolean =
-            requestCode == REQUEST_CODE && grantResults.isNotEmpty() && grantResults[0] == PackageManager.PERMISSION_GRANTED
+        requestCode == REQUEST_CODE && grantResults.isNotEmpty() && grantResults[0] == PackageManager.PERMISSION_GRANTED
 
-    fun granted(): Boolean = !buildMinVersionM() || grantedAndroidM()
-
-    @TargetApi(Build.VERSION_CODES.M)
-    private fun grantedAndroidM(): Boolean =
-            activity.checkSelfPermission(Manifest.permission.ACCESS_FINE_LOCATION) == PackageManager.PERMISSION_GRANTED
+    fun granted(): Boolean =
+        activity.checkSelfPermission(Manifest.permission.ACCESS_FINE_LOCATION) == PackageManager.PERMISSION_GRANTED
 
     companion object {
         internal val PERMISSIONS = arrayOf(Manifest.permission.ACCESS_FINE_LOCATION)