use runCatching

Author: VREMSoftwareDevelopment

app/build.gradle

@@ -61,20 +61,20 @@ dependencies {
 }
 
 android {
-    namespace 'com.vrem.wifianalyzer'
-    compileSdk 35
+    namespace = 'com.vrem.wifianalyzer'
+    compileSdk = 35
 
     sourceSets.each {
         it.java.srcDirs += "src/$it.name/kotlin"
     }
 
     defaultConfig {
-        applicationId "com.vrem.wifianalyzer"
+        applicationId = "com.vrem.wifianalyzer"
         minSdkVersion 24
         targetSdkVersion 35
         versionCode
         versionName
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
 
     buildFeatures {
@@ -83,28 +83,28 @@ android {
 
     buildTypes {
         release {
-            minifyEnabled true
-            shrinkResources true
+            minifyEnabled = true
+            shrinkResources = true
             proguardFiles getDefaultProguardFile("proguard-android.txt")
             signingConfig
         }
         debug {
-            applicationIdSuffix ".BETA"
-            versionNameSuffix "-BETA"
-            minifyEnabled false
-            shrinkResources false
-            debuggable true
-            enableUnitTestCoverage true
+            applicationIdSuffix = ".BETA"
+            versionNameSuffix = "-BETA"
+            minifyEnabled = false
+            shrinkResources = false
+            debuggable = true
+            enableUnitTestCoverage = true
         }
     }
 
     testOptions {
         unitTests {
-            includeAndroidResources true
+            includeAndroidResources = true
             all {
                 jvmArgs("-XX:+EnableDynamicAgentLoading")
                 testLogging {
-                    events "passed", "skipped", "failed", "standardOut", "standardError"
+                    events = ["passed", "skipped", "failed", "standardOut", "standardError"]
                     outputs.upToDateWhen { false }
                     showStandardStreams = true
                 }
@@ -113,8 +113,8 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_17
-        targetCompatibility JavaVersion.VERSION_17
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
     kotlinOptions {
         jvmTarget = "17"

app/build.properties

@@ -1,6 +1,6 @@
 #Build Properties
-#Mon Jul 07 15:36:11 EDT 2025
-version_build=10
+#Sat Jul 12 11:38:03 EDT 2025
+version_build=11
 version_major=3
 version_minor=2
 version_patch=1

app/src/androidTest/kotlin/com/vrem/wifianalyzer/InstrumentedTestUtils.kt

@@ -52,22 +52,11 @@ internal fun withToolbarTitle(expectedTitle: CharSequence): Matcher<View> {
     }
 }
 
-internal fun pressBackButton() {
-    pressBack()
-}
+internal fun pressBackButton() = pressBack()
 
-internal fun pauseShort() {
-    pause(SLEEP_1_SECOND)
-}
+internal fun pauseShort() = pause(SLEEP_1_SECOND)
 
-internal fun pauseLong() {
-    pause(SLEEP_3_SECONDS)
-}
+internal fun pauseLong() = pause(SLEEP_3_SECONDS)
 
-private fun pause(sleepTime: Int) {
-    try {
-        Thread.sleep(sleepTime.toLong())
-    } catch (e: InterruptedException) {
-        e.printStackTrace()
-    }
-}
+private fun pause(sleepTime: Int) =
+    runCatching { Thread.sleep(sleepTime.toLong()) }.getOrElse{ it.printStackTrace() }

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

@@ -19,19 +19,24 @@ package com.vrem.util
 
 import android.content.res.Resources
 import androidx.annotation.RawRes
-import java.io.InputStream
+import java.util.zip.ZipInputStream
 
-fun readFile(resources: Resources, @RawRes id: Int): String {
-    return try {
-        resources.openRawResource(id).use { read(it) }
-    } catch (e: Exception) {
-        String.EMPTY
+fun readFile(resources: Resources, @RawRes id: Int): String =
+    runCatching {
+        resources.openRawResource(id)
+            .bufferedReader()
+            .use { it.readText() }
+            .replace("\r", String.EMPTY)
     }
-}
+        .getOrDefault(String.EMPTY)
 
-private fun read(inputStream: InputStream): String {
-    val size = inputStream.available()
-    val bytes = ByteArray(size)
-    val count = inputStream.read(bytes)
-    return if (count == size) String(bytes).replace("\r", "") else String.EMPTY
-}
+fun readZipFile(resources: Resources, @RawRes id: Int): List<String> =
+    runCatching {
+        resources.openRawResource(id).use { inputStream ->
+            ZipInputStream(inputStream).use { zipInputStream ->
+                zipInputStream.nextEntry
+                zipInputStream.bufferedReader().readLines()
+            }
+        }
+    }
+        .getOrDefault(emptyList())

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

@@ -19,10 +19,8 @@ package com.vrem.wifianalyzer.about
 
 import android.app.Activity
 import android.app.AlertDialog
-import android.content.ActivityNotFoundException
 import android.content.Intent
 import android.content.pm.PackageInfo
-import android.content.pm.PackageManager.NameNotFoundException
 import android.os.Build
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -118,22 +116,19 @@ class AboutFragment : Fragment() {
     }
 
     private fun applicationVersion(activity: FragmentActivity): String =
-        try {
+        runCatching {
             val packageInfo: PackageInfo = activity.packageInfo()
             packageInfo.versionName + " - " + PackageInfoCompat.getLongVersionCode(packageInfo)
-        } catch (e: NameNotFoundException) {
-            String.EMPTY
-        }
-
+        }.getOrDefault(String.EMPTY)
 
     private class WriteReviewClickListener(private val activity: Activity) : View.OnClickListener {
         override fun onClick(view: View) {
             val url = "market://details?id=" + activity.applicationContext.packageName
             val intent = Intent(Intent.ACTION_VIEW, url.toUri())
-            try {
+            runCatching {
                 activity.startActivity(intent)
-            } catch (e: ActivityNotFoundException) {
-                Toast.makeText(view.context, e.localizedMessage, Toast.LENGTH_LONG).show()
+            }.getOrElse{
+                Toast.makeText(view.context, it.localizedMessage, Toast.LENGTH_LONG).show()
             }
         }
     }

app/src/main/kotlin/com/vrem/wifianalyzer/navigation/items/ExportItem.kt

@@ -17,7 +17,6 @@
  */
 package com.vrem.wifianalyzer.navigation.items
 
-import android.content.ActivityNotFoundException
 import android.content.Intent
 import android.widget.Toast
 import com.vrem.wifianalyzer.MainActivity
@@ -40,11 +39,11 @@ internal class ExportItem(private val export: Export) : NavigationItem {
             Toast.makeText(mainActivity, R.string.export_not_available, Toast.LENGTH_LONG).show()
             return
         }
-        try {
-            mainActivity.startActivity(intent)
-        } catch (e: ActivityNotFoundException) {
-            Toast.makeText(mainActivity, e.localizedMessage, Toast.LENGTH_LONG).show()
-        }
+        runCatching { mainActivity.startActivity(intent) }
+            .getOrElse {
+                Toast.makeText(mainActivity, it.localizedMessage, Toast.LENGTH_LONG)
+                    .show()
+            }
     }
 
     private fun exportAvailable(mainActivity: MainActivity, chooser: Intent): Boolean =

app/src/main/kotlin/com/vrem/wifianalyzer/navigation/options/OptionMenu.kt

@@ -38,11 +38,7 @@ class OptionMenu {
     fun select(item: MenuItem): Unit = OptionAction.findOptionAction(item.itemId).action()
 
     @SuppressLint("RestrictedApi")
-    private fun iconsVisible(menu: Menu) {
-        try {
-            (menu as MenuBuilder).setOptionalIconsVisible(true)
-        } catch (e: Exception) {
-            // do nothing
-        }
-    }
+    private fun iconsVisible(menu: Menu): Result<Unit> =
+        runCatching { (menu as MenuBuilder).setOptionalIconsVisible(true) }
+
 }

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

@@ -28,38 +28,26 @@ import com.vrem.util.buildMinVersionP
 class LocationPermission(private val activity: Activity) {
     fun enabled(): Boolean =
         if (buildMinVersionP()) {
-            try {
+            runCatching {
                 val locationManager = activity.getSystemService(LocationManager::class.java)
                 locationEnabled(locationManager) ||
-                    networkProviderEnabled(locationManager) ||
-                    gpsProviderEnabled(locationManager)
-            } catch (e: Exception) {
-                false
-            }
+                        networkProviderEnabled(locationManager) ||
+                        gpsProviderEnabled(locationManager)
+            }.getOrDefault(false)
         } else {
             true
         }
 
     private fun gpsProviderEnabled(locationManager: LocationManager): Boolean =
-        try {
-            locationManager.isProviderEnabled(LocationManager.GPS_PROVIDER)
-        } catch (e: Exception) {
-            false
-        }
+        runCatching { locationManager.isProviderEnabled(LocationManager.GPS_PROVIDER) }
+            .getOrDefault(false)
 
     private fun networkProviderEnabled(locationManager: LocationManager): Boolean =
-        try {
-            locationManager.isProviderEnabled(LocationManager.NETWORK_PROVIDER)
-        } catch (e: Exception) {
-            false
-        }
+        runCatching { locationManager.isProviderEnabled(LocationManager.NETWORK_PROVIDER) }
+            .getOrDefault(false)
 
     @RequiresApi(Build.VERSION_CODES.P)
     private fun locationEnabled(locationManager: LocationManager): Boolean =
-        try {
-            locationManager.isLocationEnabled
-        } catch (e: Exception) {
-            false
-        }
+        runCatching { locationManager.isLocationEnabled }.getOrDefault(false)
 
 }

app/src/main/kotlin/com/vrem/wifianalyzer/settings/Repository.kt

@@ -40,44 +40,45 @@ class Repository(private val context: Context) {
 
     fun string(key: Int, defaultValue: String): String {
         val keyValue: String = context.getString(key)
-        return try {
+        return runCatching {
             sharedPreferences().getString(keyValue, defaultValue) ?: defaultValue
-        } catch (e: Exception) {
+        }.getOrElse {
             sharedPreferences().edit { putString(keyValue, defaultValue) }
             defaultValue
         }
     }
 
     fun boolean(key: Int, defaultValue: Boolean): Boolean {
         val keyValue: String = context.getString(key)
-        return try {
+        return runCatching {
             sharedPreferences().getBoolean(keyValue, defaultValue)
-        } catch (e: Exception) {
+        }.getOrElse {
             sharedPreferences().edit { putBoolean(keyValue, defaultValue) }
-            defaultValue
+            return defaultValue
         }
     }
 
     fun resourceBoolean(key: Int): Boolean = context.resources.getBoolean(key)
 
     fun integer(key: Int, defaultValue: Int): Int {
         val keyValue: String = context.getString(key)
-        return try {
+        return runCatching {
             sharedPreferences().getInt(keyValue, defaultValue)
-        } catch (e: Exception) {
+        }.getOrElse {
             sharedPreferences().edit { putString(keyValue, defaultValue.toString()) }
-            defaultValue
+            return defaultValue
         }
     }
 
     fun stringSet(key: Int, defaultValues: Set<String>): Set<String> {
         val keyValue: String = context.getString(key)
-        return try {
+        return runCatching {
             sharedPreferences().getStringSet(keyValue, defaultValues)!!
-        } catch (e: Exception) {
+        }.getOrElse {
             sharedPreferences().edit { putStringSet(keyValue, defaultValues) }
-            defaultValues
+            return defaultValues
         }
+
     }
 
     fun saveStringSet(key: Int, values: Set<String>): Unit =

app/src/main/kotlin/com/vrem/wifianalyzer/vendor/model/VendorService.kt

@@ -20,7 +20,7 @@ package com.vrem.wifianalyzer.vendor.model
 import android.content.res.Resources
 import com.vrem.annotation.OpenClass
 import com.vrem.util.EMPTY
-import com.vrem.util.readFile
+import com.vrem.util.readZipFile
 import com.vrem.wifianalyzer.R
 import java.util.Locale
 import java.util.TreeMap
@@ -51,8 +51,7 @@ class VendorService(private val resources: Resources) {
     private fun load(resources: Resources): VendorData {
         val macs: MutableMap<String, String> = TreeMap()
         val vendors: MutableMap<String, List<String>> = TreeMap()
-        readFile(resources, R.raw.data)
-            .split("\n")
+        readZipFile(resources, R.raw.data)
             .map { it.split("|").toTypedArray() }
             .filter { it.size == 2 }
             .forEach {