diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index a2cc883..e6dd38d 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -4,11 +4,10 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <option name="testRunner" value="GRADLE" />
+        <option name="testRunner" value="CHOOSE_PER_TEST" />
         <option name="disableWrapperSourceDistributionNotification" value="true" />
-        <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="jbr-17" />
+        <option name="gradleJvm" value="#GRADLE_LOCAL_JAVA_HOME" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 0f86676..8978d23 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,4 +1,5 @@
 <project version="4">
+  <component name="ExternalStorageConfigurationManager" enabled="true" />
   <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
diff --git a/app/build.gradle b/app/build.gradle
index 1712de1..f2d6e75 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -6,18 +6,18 @@ plugins {
 
 android {
     defaultConfig {
-        compileSdk 34
-        targetSdk 34
-        applicationId "com.meshcentral.agent2"
-        minSdk 23
-        versionCode 28
-        versionName "1.0.21"
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        compileSdk = 34
+        targetSdk = 34
+        applicationId = "com.meshcentral.agent2"
+        minSdk = 23
+        versionCode = 28
+        versionName = "1.0.21"
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
 
     buildTypes {
         debug {
-            debuggable true
+            debuggable = true
         }
         release {
             // Enables code shrinking, obfuscation, and optimization for only
@@ -31,20 +31,23 @@ android {
             // Includes the default ProGuard rules files that are packaged with
             // the Android Gradle plugin. To learn more, go to the section about
             // R8 configuration files.
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-            signingConfig signingConfigs.debug
+            proguardFiles(getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro')
+            signingConfig = signingConfigs.debug
 
             //debuggable true
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
     }
     kotlinOptions {
         jvmTarget = '1.8'
     }
-    namespace 'com.meshcentral.agent'
+    namespace = 'com.meshcentral.agent'
+    buildFeatures {
+        buildConfig = true
+    }
 }
 
 dependencies {
@@ -56,9 +59,9 @@ dependencies {
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     implementation 'androidx.navigation:navigation-fragment-ktx:2.7.7'
     implementation 'androidx.navigation:navigation-ui-ktx:2.7.7'
-    implementation 'com.budiyev.android:code-scanner:2.1.0'
-    implementation 'com.karumi:dexter:6.2.2'
-    implementation 'com.squareup.okhttp3:okhttp:4.9.0'
+    implementation 'com.github.yuriy-budiyev:code-scanner:2.3.2'
+    implementation 'com.karumi:dexter:6.2.3'
+    implementation 'com.squareup.okhttp3:okhttp:5.3.2'
     implementation 'com.madgag.spongycastle:bcpkix-jdk15on:1.58.0.0'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     implementation 'com.google.firebase:firebase-messaging:23.4.1'
diff --git a/app/src/main/java/com/meshcentral/agent/AuthFragment.kt b/app/src/main/java/com/meshcentral/agent/AuthFragment.kt
index e15c444..e55fa74 100644
--- a/app/src/main/java/com/meshcentral/agent/AuthFragment.kt
+++ b/app/src/main/java/com/meshcentral/agent/AuthFragment.kt
@@ -14,10 +14,10 @@ import androidx.navigation.fragment.findNavController
 import java.lang.Exception
 
 class AuthFragment : Fragment() {
-    var countDownTimer : CountDownTimer? = null
+    private lateinit var countDownTimer : CountDownTimer
 
     override fun onCreate(savedInstanceState: Bundle?) {
-        println("onCreate-auth");
+        println("onCreate-auth")
         super.onCreate(savedInstanceState)
     }
 
@@ -25,37 +25,36 @@ class AuthFragment : Fragment() {
         inflater: LayoutInflater, container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View? {
-        println("onCreateView-auth");
+        println("onCreateView-auth")
         // Inflate the layout for this fragment
         return inflater.inflate(R.layout.fragment_auth, container, false)
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        println("onViewCreated-auth");
+        println("onViewCreated-auth")
         super.onViewCreated(view, savedInstanceState)
         authFragment = this
-        visibleScreen = 4;
+        visibleScreen = 4
 
         // Set authentication code
-        var t:TextView = view.findViewById<Button>(R.id.authTopText2) as TextView
-        t.text = "000000"
+        val t:TextView? = view.findViewById(R.id.authTopText2)
+        t?.text = getString(R.string.zero_string)
         if (g_auth_url != null) {
-            var authCode: String? = g_auth_url?.getQueryParameter("code")
+            val authCode: String? = g_auth_url?.getQueryParameter("code")
             if (authCode != null) {
-                t.text = String(Base64.decode(authCode, Base64.DEFAULT), charset("UTF-8"))
+                t?.text = String(Base64.decode(authCode, Base64.DEFAULT), charset("UTF-8"))
             }
         }
 
         // Set authentication progress bar
-        var p:ProgressBar = view.findViewById<Button>(R.id.authProgressBar) as ProgressBar
-        p.progress = 100
+        val p:ProgressBar? = view.findViewById(R.id.authProgressBar)
+        p?.progress = 100
         countDownTimer = object : CountDownTimer(60000, 600) {
             override fun onTick(millisUntilFinished: Long) {
-                var p:ProgressBar = view.findViewById<Button>(R.id.authProgressBar) as ProgressBar
-                if (p.progress > 0) { p.progress = p.progress - 1 }
+                val p:ProgressBar? = view.findViewById(R.id.authProgressBar)
+                if (p?.progress!! > 0) { p.progress -= 1 }
             }
             override fun onFinish() {
-                countDownTimer = null
                 exit()
             }
         }.start()
@@ -74,12 +73,11 @@ class AuthFragment : Fragment() {
     }
 
     fun exit() {
-        if (countDownTimer != null) {
-            countDownTimer?.cancel()
-            countDownTimer = null
+        if (this::countDownTimer.isInitialized) {
+            countDownTimer.cancel()
         }
         try {
             findNavController().navigate(R.id.action_authFragment_to_FirstFragment)
-        } catch (ex: Exception) {}
+        } catch (_: Exception) {}
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/meshcentral/agent/MainActivity.kt b/app/src/main/java/com/meshcentral/agent/MainActivity.kt
index aca1448..a2e2b7e 100644
--- a/app/src/main/java/com/meshcentral/agent/MainActivity.kt
+++ b/app/src/main/java/com/meshcentral/agent/MainActivity.kt
@@ -2,7 +2,6 @@ package com.meshcentral.agent
 
 //import com.google.firebase.iid.FirebaseInstanceId
 import android.Manifest
-import android.app.Activity
 import android.app.AlertDialog
 import android.app.Notification
 import android.app.NotificationChannel
@@ -28,6 +27,9 @@ import android.view.Menu
 import android.view.MenuItem
 import android.widget.EditText
 import android.widget.Toast
+import androidx.activity.result.ActivityResultLauncher
+import androidx.activity.result.IntentSenderRequest
+import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.app.ActivityCompat
 import androidx.core.content.ContextCompat
@@ -77,7 +79,6 @@ var agentCertificate : X509Certificate? = null
 var agentCertificateKey : PrivateKey? = null
 var pageUrl : String? = null
 var cameraPresent : Boolean = false
-var pendingActivities : ArrayList<PendingActivityData> = ArrayList<PendingActivityData>()
 var pushMessagingToken : String? = null
 var g_autoConnect : Boolean = true
 var g_autoConsent : Boolean = false
@@ -100,6 +101,58 @@ class MainActivity : AppCompatActivity() {
     lateinit var notificationManager: NotificationManager
     lateinit var builder: Notification.Builder
 
+    // Activity Result Launcher for screen capture (replaces deprecated startActivityForResult)
+    private val screenCaptureLauncher: ActivityResultLauncher<Intent> =
+        registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
+            println("screenCaptureLauncher, resultCode: ${result.resultCode}, data: ${result.data}")
+            if (result.resultCode == RESULT_OK) {
+                startService(ScreenCaptureService.getStartIntent(this, result.resultCode, result.data))
+                if (meshAgent?.tunnels?.getOrNull(0) != null) {
+                    val json = JSONObject()
+                    json.put("type", "console")
+                    json.put("msg", null)
+                    json.put("msgid", 0)
+                    meshAgent!!.tunnels[0].sendCtrlResponse(json)
+                }
+            } else {
+                if (meshAgent?.tunnels?.getOrNull(0) != null) {
+                    val json = JSONObject()
+                    json.put("type", "console")
+                    json.put("msg", "denied")
+                    json.put("msgid", 2)
+                    meshAgent!!.tunnels[0].sendCtrlResponse(json)
+                    meshAgent!!.tunnels[0].Stop()
+                }
+            }
+        }
+
+    // Pending activity data for intent sender results (file deletion permission)
+    private var pendingIntentSenderData: PendingActivityData? = null
+
+    // Activity Result Launcher for intent sender (replaces deprecated startIntentSenderForResult)
+    private val intentSenderLauncher: ActivityResultLauncher<IntentSenderRequest> =
+        registerForActivityResult(ActivityResultContracts.StartIntentSenderForResult()) { result ->
+            println("intentSenderLauncher, resultCode: ${result.resultCode}")
+            val pad = pendingIntentSenderData
+            if (pad != null) {
+                if (result.resultCode == RESULT_OK) {
+                    println("Approved: ${pad.url}, ${pad.where}, ${pad.args}")
+                    pad.tunnel.deleteFileEx(pad)
+                } else {
+                    println("Denied: ${pad.url}, ${pad.where}, ${pad.args}")
+                    pad.tunnel.deleteFileEx(pad)
+                }
+                pendingIntentSenderData = null
+            }
+        }
+
+    // Launch intent sender for file deletion permission (called from MeshTunnel)
+    fun launchIntentSenderForResult(intentSender: android.content.IntentSender, pad: PendingActivityData) {
+        pendingIntentSenderData = pad
+        val request = IntentSenderRequest.Builder(intentSender).build()
+        intentSenderLauncher.launch(request)
+    }
+
     init {
         Security.removeProvider(BouncyCastleProvider.PROVIDER_NAME)
         Security.insertProviderAt(BouncyCastleProvider(), 1)
@@ -150,7 +203,7 @@ class MainActivity : AppCompatActivity() {
         */
 
         // See if we there open by a notification with a URL
-        var intentUrl : String? = intent.getStringExtra("url")
+        val intentUrl : String? = intent.getStringExtra("url")
         //println("Main Activity Create URL: $intentUrl")
         if (intentUrl != null) {
             intent.removeExtra("url")
@@ -161,7 +214,7 @@ class MainActivity : AppCompatActivity() {
                     g_auth_url = Uri.parse(intentUrl)
                     // If not connected, connect to the server now.
                     if (meshAgent == null) {
-                        toggleAgentConnection(false);
+                        toggleAgentConnection(false)
                     } else {
                         // Switch to 2FA auth screen
                         if (mainFragment != null) {
@@ -172,8 +225,8 @@ class MainActivity : AppCompatActivity() {
                 }
             } else if (intentUrl.lowercase().startsWith("http://") || intentUrl.lowercase().startsWith("https://")) {
                 // Open an HTTP or HTTPS URL.
-                var getintent: Intent = Intent(Intent.ACTION_VIEW, Uri.parse(intentUrl));
-                startActivity(getintent);
+                val getintent = Intent(Intent.ACTION_VIEW, Uri.parse(intentUrl))
+                startActivity(getintent)
             }
         }
 
@@ -190,7 +243,7 @@ class MainActivity : AppCompatActivity() {
 
     private val batteryInfoReceiver: BroadcastReceiver = object : BroadcastReceiver() {
         override fun onReceive(context: Context, intent: Intent) {
-            if (meshAgent != null) { meshAgent?.batteryStateChanged(intent) }
+            meshAgent?.batteryStateChanged(intent)
         }
     }
 
@@ -201,26 +254,26 @@ class MainActivity : AppCompatActivity() {
     }
 
     override fun onPrepareOptionsMenu(menu: Menu): Boolean {
-        var item1 = menu.findItem(R.id.action_setup_server);
-        item1.isVisible = (visibleScreen == 1) && (hardCodedServerLink == null);
-        item1.isEnabled = cameraPresent;
-        var item2 = menu.findItem(R.id.action_clear_server);
-        item2.isVisible = (visibleScreen == 1) && (serverLink != null) && (hardCodedServerLink == null);
-        var item3 = menu.findItem(R.id.action_close);
-        item3.isVisible = (visibleScreen != 1);
-        var item4 = menu.findItem(R.id.action_sharescreen);
+        val item1 = menu.findItem(R.id.action_setup_server)
+        item1.isVisible = (visibleScreen == 1) && (hardCodedServerLink == null)
+        item1.isEnabled = cameraPresent
+        val item2 = menu.findItem(R.id.action_clear_server)
+        item2.isVisible = (visibleScreen == 1) && (serverLink != null) && (hardCodedServerLink == null)
+        val item3 = menu.findItem(R.id.action_close)
+        item3.isVisible = (visibleScreen != 1)
+        val item4 = menu.findItem(R.id.action_sharescreen)
         item4.isVisible = false // (g_ScreenCaptureService == null) && (meshAgent != null) && (meshAgent!!.state == 3)
-        var item5 = menu.findItem(R.id.action_stopscreensharing);
+        val item5 = menu.findItem(R.id.action_stopscreensharing)
         item5.isVisible = (g_ScreenCaptureService != null)
-        var item6 = menu.findItem(R.id.action_manual_setup_server);
+        val item6 = menu.findItem(R.id.action_manual_setup_server)
         item6.isVisible = (visibleScreen == 1) && (serverLink == null) && (hardCodedServerLink == null)
-        var item7 = menu.findItem(R.id.action_testAuth);
+        val item7 = menu.findItem(R.id.action_testAuth)
         item7.isVisible = false //(visibleScreen == 1) && (serverLink != null);
-        var item8 = menu.findItem(R.id.action_settings);
-        item8.isVisible = (visibleScreen == 1);
-        var item9 = menu.findItem(R.id.action_enablepushauthentication);
-        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.N) {
-            item9.isVisible = (notificationManager.areNotificationsEnabled() == false)
+        val item8 = menu.findItem(R.id.action_settings)
+        item8.isVisible = (visibleScreen == 1)
+        val item9 = menu.findItem(R.id.action_enablepushauthentication)
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+            item9.isVisible = (!notificationManager.areNotificationsEnabled())
         } else {
             item9.isVisible = false
         }
@@ -294,49 +347,6 @@ class MainActivity : AppCompatActivity() {
         super.onDestroy()
     }
 
-    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
-        println("onActivityResult, requestCode: $requestCode, resultCode: $resultCode, data: ${data.toString()}")
-        super.onActivityResult(requestCode, resultCode, data)
-
-        if (requestCode == MainActivity.Companion.REQUEST_CODE) {
-            if (resultCode == RESULT_OK) {
-                startService(com.meshcentral.agent.ScreenCaptureService.getStartIntent(this, resultCode, data))
-                if (meshAgent?.tunnels?.getOrNull(0) != null) {
-                    val json = JSONObject()
-                    json.put("type", "console")
-                    json.put("msg", null)
-                    json.put("msgid", 0)
-                    meshAgent!!.tunnels[0].sendCtrlResponse(json)
-                }
-                return
-            } else {
-                if (meshAgent?.tunnels?.getOrNull(0) != null) {
-                    val json = JSONObject()
-                    json.put("type", "console")
-                    json.put("msg", "denied")
-                    json.put("msgid", 2)
-                    meshAgent!!.tunnels[0].sendCtrlResponse(json)
-                    meshAgent!!.tunnels[0].Stop()
-                }
-                return
-            }
-        }
-
-        var pad : PendingActivityData? = null
-        for (b in pendingActivities) { if (b.id == requestCode) { pad = b } }
-
-        if (pad != null) {
-            if (resultCode == Activity.RESULT_OK) {
-                println("Approved: ${pad.url}, ${pad.where}, ${pad.args}")
-                pad.tunnel.deleteFileEx(pad)
-            } else {
-                println("Denied: ${pad.url}, ${pad.where}, ${pad.args}")
-                pad.tunnel.deleteFileEx(pad)
-            }
-            pendingActivities.remove(pad)
-        }
-    }
-
     fun setMeshServerLink(x: String?) {
         if ((serverLink == x) || (hardCodedServerLink != null)) return
         if (meshAgent != null) { // Stop the agent
@@ -354,7 +364,7 @@ class MainActivity : AppCompatActivity() {
     // Open a URL in the web view fragment
     fun openUrl(xpageUrl: String) : Boolean {
         if (visibleScreen == 2) return false
-        pageUrl = xpageUrl;
+        pageUrl = xpageUrl
         if (visibleScreen == 1) {
             if (mainFragment != null) mainFragment?.moveToWebPage(xpageUrl)
         } else {
@@ -421,14 +431,14 @@ class MainActivity : AppCompatActivity() {
             val builder = AlertDialog.Builder(this)
             builder.setTitle(title)
             builder.setMessage(msg)
-            builder.setPositiveButton(android.R.string.ok) { _, _ -> run {} }
+            builder.setPositiveButton(android.R.string.ok) { _, _ -> kotlin.run {} }
             alert = builder.show()
         }
     }
 
     fun showToastMessage(msg: String) {
         this.runOnUiThread {
-            var toast = Toast.makeText(getApplicationContext(), msg, Toast.LENGTH_LONG)
+            val toast = Toast.makeText(applicationContext, msg, Toast.LENGTH_LONG)
             toast?.setGravity(Gravity.CENTER, 0, 300)
             toast?.show()
         }
@@ -436,20 +446,20 @@ class MainActivity : AppCompatActivity() {
 
     fun getServerHost() : String? {
         if (serverLink == null) return null
-        var x : List<String> = serverLink!!.split(',')
-        var serverHost = x[0]
+        val x : List<String> = serverLink!!.split(',')
+        val serverHost = x[0]
         return serverHost.substring(5)
     }
 
     fun getServerHash() : String? {
         if (serverLink == null) return null
-        var x : List<String> = serverLink!!.split(',')
+        val x : List<String> = serverLink!!.split(',')
         return x[1]
     }
 
     fun getDevGroup() : String? {
         if (serverLink == null) return null
-        var x : List<String> = serverLink!!.split(',')
+        val x : List<String> = serverLink!!.split(',')
         return x[2]
     }
 
@@ -496,7 +506,7 @@ class MainActivity : AppCompatActivity() {
     override fun onRequestPermissionsResult(requestCode: Int, permissions: Array<out String>, grantResults: IntArray) {
         super.onRequestPermissionsResult(requestCode, permissions, grantResults)
         if (requestCode == REQUEST_ALL_PERMISSIONS) {
-            permissions.forEachIndexed { index, permission ->
+            permissions.forEachIndexed { index, _ ->
                 if (grantResults[index] == PackageManager.PERMISSION_DENIED) {
                     // Handle each denied permission if necessary
                 }
@@ -508,11 +518,11 @@ class MainActivity : AppCompatActivity() {
         //println("toggleAgentConnection")
         if ((meshAgent == null) && (serverLink != null)) {
             // Create and connect the agent
-            requestAllPermissions();
+            requestAllPermissions()
             if (agentCertificate == null) {
                 val sharedPreferences = getSharedPreferences("meshagent", Context.MODE_PRIVATE)
-                var certb64 : String? = sharedPreferences?.getString("agentCert", null)
-                var keyb64 : String? = sharedPreferences?.getString("agentKey", null)
+                val certb64 : String? = sharedPreferences?.getString("agentCert", null)
+                val keyb64 : String? = sharedPreferences?.getString("agentKey", null)
                 if ((certb64 == null) || (keyb64 == null)) {
                     //println("Generating new certificates...")
 
@@ -522,8 +532,8 @@ class MainActivity : AppCompatActivity() {
                     val keypair = keyGen.generateKeyPair()
 
                     // Generate Serial Number
-                    var serial : BigInteger = BigInteger("12345678");
-                    try { serial = BigInteger.valueOf(Random().nextInt().toLong().absoluteValue) } catch (ex: Exception) {}
+                    var serial = BigInteger("12345678");
+                    try { serial = BigInteger.valueOf(Random().nextInt().toLong().absoluteValue) } catch (_: Exception) {}
 
                     // Create self signed certificate
                     val builder: X509v3CertificateBuilder = JcaX509v3CertificateBuilder(
@@ -619,9 +629,9 @@ class MainActivity : AppCompatActivity() {
     }
 
     fun isMshStringValid(x: String):Boolean {
-        if (x.startsWith("mc://") == false)  return false
-        var xs = x.split(',')
-        if (xs.count() < 3) return false
+        if (!x.startsWith("mc://"))  return false
+        val xs = x.split(',')
+        if (xs.size < 3) return false
         if (xs[0].length < 8) return false
         if (xs[1].length < 3) return false
         if (xs[2].length < 3) return false
@@ -642,7 +652,7 @@ class MainActivity : AppCompatActivity() {
 
         // Set up the buttons
         builder.setPositiveButton(android.R.string.ok) { _, _ ->
-            var link = input.text.toString()
+            val link = input.text.toString()
             println("LINK: $link")
             if (isMshStringValid(link)) {
                 setMeshServerLink(link)
@@ -668,7 +678,7 @@ class MainActivity : AppCompatActivity() {
     fun startProjection() {
         if ((g_ScreenCaptureService != null) || (meshAgent == null) || (meshAgent!!.state != 3)) return
         val mProjectionManager = getSystemService(MEDIA_PROJECTION_SERVICE) as MediaProjectionManager
-        startActivityForResult(mProjectionManager.createScreenCaptureIntent(), MainActivity.Companion.REQUEST_CODE)
+        screenCaptureLauncher.launch(mProjectionManager.createScreenCaptureIntent())
     }
 
     // Stop screen sharing
@@ -683,7 +693,7 @@ class MainActivity : AppCompatActivity() {
             g_autoConnect = pm.getBoolean("pref_autoconnect", false)
             g_autoConsent = pm.getBoolean("pref_autoconsent", false)
             g_userDisconnect = false
-            if (g_autoConnect == false) {
+            if (!g_autoConnect) {
                 if (g_retryTimer != null) {
                     stopRetryTimer()
                     mainFragment?.refreshInfo()
@@ -735,7 +745,6 @@ class MainActivity : AppCompatActivity() {
     }
 
     companion object {
-        private const val REQUEST_CODE = 100
         const val REQUEST_ALL_PERMISSIONS = 1
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/meshcentral/agent/MainFragment.kt b/app/src/main/java/com/meshcentral/agent/MainFragment.kt
index d0c7ee5..6892dad 100644
--- a/app/src/main/java/com/meshcentral/agent/MainFragment.kt
+++ b/app/src/main/java/com/meshcentral/agent/MainFragment.kt
@@ -275,11 +275,11 @@ class MainFragment : Fragment(), MultiplePermissionsListener {
             var imageView : ImageView? = null
             try { imageView = view?.findViewById<ImageView>(R.id.mainImageView) } catch (ex: Exception) {}
             if (imageView != null) {
-                imageView?.setImageResource(R.mipmap.ic_launcher_foreground)
-                val param = imageView?.layoutParams
+                imageView.setImageResource(R.mipmap.ic_launcher_foreground)
+                val param = imageView.layoutParams
                 if (param is ViewGroup.MarginLayoutParams) {
-                    (param as ViewGroup.MarginLayoutParams).setMargins(0, 0, 0, 0)
-                    imageView?.layoutParams = param
+                    param.setMargins(0, 0, 0, 0)
+                    imageView.layoutParams = param
                 }
             }
         }
@@ -288,11 +288,11 @@ class MainFragment : Fragment(), MultiplePermissionsListener {
             var imageView : ImageView? = null
             try { imageView = view?.findViewById<ImageView>(R.id.mainImageView) } catch (ex: Exception) {}
             if (imageView != null) {
-                imageView?.setImageResource(R.mipmap.ic_user)
-                val param = imageView?.layoutParams
+                imageView.setImageResource(R.mipmap.ic_user)
+                val param = imageView.layoutParams
                 if (param is ViewGroup.MarginLayoutParams) {
-                    (param as ViewGroup.MarginLayoutParams).setMargins(128, 128, 128, 128)
-                    imageView?.layoutParams = param
+                    param.setMargins(128, 128, 128, 128)
+                    imageView.layoutParams = param
                 }
             }
         }
diff --git a/app/src/main/java/com/meshcentral/agent/MeshAgent.kt b/app/src/main/java/com/meshcentral/agent/MeshAgent.kt
index 33158be..6f9ac92 100644
--- a/app/src/main/java/com/meshcentral/agent/MeshAgent.kt
+++ b/app/src/main/java/com/meshcentral/agent/MeshAgent.kt
@@ -96,7 +96,8 @@ class MeshAgent(parent: MainActivity, host: String, certHash: String, devGroupId
             override fun checkClientTrusted(chain: Array<out X509Certificate>?, authType: String?) {}
 
             override fun checkServerTrusted(chain: Array<out X509Certificate>?, authType: String?) {
-                serverTlsCertHash = MessageDigest.getInstance("SHA-384").digest(chain?.get(0)?.encoded)
+                val encoded = chain?.get(0)?.encoded ?: return
+                serverTlsCertHash = MessageDigest.getInstance("SHA-384").digest(encoded)
             }
 
             override fun getAcceptedIssuers() = arrayOf<X509Certificate>()
@@ -167,34 +168,34 @@ class MeshAgent(parent: MainActivity, host: String, certHash: String, devGroupId
         //println("onMessage: $text")
     }
 
-    override fun onMessage(webSocket: WebSocket, msg: ByteString) {
+    override fun onMessage(webSocket: WebSocket, bytes: ByteString) {
         try {
-            //println("onBinaryMessage: ${msg.size}, ${msg.toByteArray().toHex()}")
-            if (msg.size < 2) return;
-            if ((connectionState == 3) && (msg[0].toInt() == 123)) {
+            //println("onBinaryMessage: ${bytes.size}, ${bytes.toByteArray().toHex()}")
+            if (bytes.size < 2) return;
+            if ((connectionState == 3) && (bytes[0].toInt() == 123)) {
                 // If we are authenticated, process JSON data
-                processAgentData(String(msg.toByteArray(), Charsets.UTF_8))
+                processAgentData(String(bytes.toByteArray(), Charsets.UTF_8))
                 return
             }
 
-            var cmd : Int = (msg[0].toInt() shl 8) + msg[1].toInt()
-            //println("Cmd $cmd, Size: ${msg.size}")
+            var cmd : Int = (bytes[0].toInt() shl 8) + bytes[1].toInt()
+            //println("Cmd $cmd, Size: ${bytes.size}")
             when (cmd) {
                 1 -> {
                     // Server authentication request
-                    if (msg.size != 98) return;
-                    var serverCertHash = msg.substring(2, 50).toByteArray()
+                    if (bytes.size != 98) return;
+                    var serverCertHash = bytes.substring(2, 50).toByteArray()
                     if (!serverCertHash.contentEquals(serverTlsCertHash!!)) {
                         println("Server Hash Mismatch, given=${serverCertHash.toHex()}, computed=${serverTlsCertHash?.toHex()}")
                         stopSocket()
                         return
                     }
-                    serverNonce = msg.substring(50).toByteArray()
+                    serverNonce = bytes.substring(50).toByteArray()
 
                     // Hash the server cert hash, server nonce and client nonce and sign the result
                     val sig = Signature.getInstance("SHA384withRSA")
                     sig.initSign(agentCertificateKey)
-                    sig.update(msg.substring(2).toByteArray().plus(nonce!!))
+                    sig.update(bytes.substring(2).toByteArray().plus(nonce!!))
                     val signature = sig.sign()
 
                     // Construct the response [2, sideOfCert, Cert, Signature]
@@ -210,8 +211,8 @@ class MeshAgent(parent: MainActivity, host: String, certHash: String, devGroupId
                 }
                 2 -> {
                     // Server agent certificate
-                    var xcertLen: Int = (msg[2].toUByte().toInt() shl 8) + msg[3].toUByte().toInt()
-                    var xcertBytes = msg.substring(4, 4 + xcertLen)
+                    var xcertLen: Int = (bytes[2].toUByte().toInt() shl 8) + bytes[3].toUByte().toInt()
+                    var xcertBytes = bytes.substring(4, 4 + xcertLen)
                     var xagentCertificate = CertificateFactory.getInstance("X509").generateCertificate(
                             ByteArrayInputStream(xcertBytes.toByteArray())
                     ) as X509Certificate
@@ -232,7 +233,7 @@ class MeshAgent(parent: MainActivity, host: String, certHash: String, devGroupId
                     val sig = Signature.getInstance("SHA384withRSA")
                     sig.initVerify(xagentCertificate)
                     sig.update(signBlock)
-                    if (!sig.verify(msg.substring(4 + xcertLen).toByteArray())) {
+                    if (!sig.verify(bytes.substring(4 + xcertLen).toByteArray())) {
                         println("Invalid Server Signature"); stopSocket(); return
                     }
 
@@ -410,7 +411,7 @@ class MeshAgent(parent: MainActivity, host: String, certHash: String, devGroupId
                             /*
                             {"action":"msg",
                             "type":"tunnel",
-                            "value":"*\/meshrelay.ashx?...",
+                            "value":"*\/meshrelay.ashx?...\",
                             "usage":5,
                             "servertlshash":"97eaf674eab131d3775f12cfa9c978d185a0e9caaf3a854bf0eb4ff94c2d6c53ca3dc456da149002804666fbbdae2fc9",
                             "soptions":{
@@ -634,7 +635,7 @@ class MeshAgent(parent: MainActivity, host: String, certHash: String, devGroupId
                 var x = JSONObject()
                 x.put("address", j.address.hostAddress)
                 if (n.hardwareAddress != null) {
-                    var mac = n.hardwareAddress.toHex().toUpperCase()
+                    var mac = n.hardwareAddress.toHex().uppercase()
                     x.put("mac", mac.substring(0, 2) + ":" + mac.substring(2, 4) + ":" + mac.substring(4, 6) + ":" + mac.substring(6, 8) + ":" + mac.substring(8, 10) + ":" + mac.substring(10, 12))
                 }
                 if (n.isUp) {
@@ -642,7 +643,7 @@ class MeshAgent(parent: MainActivity, host: String, certHash: String, devGroupId
                 } else {
                     x.put("status", "down")
                 }
-                if (j.address.hostAddress.indexOf(':') >= 0) {
+                if (j.address.hostAddress?.indexOf(':') ?: -1 >= 0) {
                     x.put("family", "IPv6")
                 } else {
                     x.put("family", "IPv4")
@@ -911,12 +912,13 @@ class MeshAgent(parent: MainActivity, host: String, certHash: String, devGroupId
                     } catch (e: Exception) {
                     }
                     if ((t > 0) && (t <= 10000)) {
-                        val v = parent.getApplicationContext()
-                                .getSystemService(Context.VIBRATOR_SERVICE) as Vibrator
+                        @Suppress("DEPRECATION")
+                        val v = parent.applicationContext
+                                .getSystemService(Context.VIBRATOR_SERVICE) as? Vibrator
                         if (v == null) {
                             r = "Not supported"
                         } else {
-                            // Vibrate for 500 milliseconds
+                            // Vibrate for t milliseconds
                             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
                                 v.vibrate(
                                         VibrationEffect.createOneShot(
@@ -925,6 +927,7 @@ class MeshAgent(parent: MainActivity, host: String, certHash: String, devGroupId
                                         )
                                 )
                             } else {
+                                @Suppress("DEPRECATION")
                                 v.vibrate(t)
                             }
                             r = "ok"
@@ -938,7 +941,7 @@ class MeshAgent(parent: MainActivity, host: String, certHash: String, devGroupId
                 if (splitCmd.size < 2) {
                     r = "Usage:\r\n  flash [milliseconds]";
                 } else if (splitCmd.size >= 2) {
-                    var isFlashAvailable = parent.getApplicationContext().getPackageManager()
+                    var isFlashAvailable = parent.applicationContext.packageManager
                             .hasSystemFeature(PackageManager.FEATURE_CAMERA_FRONT);
                     if (!isFlashAvailable) {
                         r = "Flash not available"
@@ -949,9 +952,9 @@ class MeshAgent(parent: MainActivity, host: String, certHash: String, devGroupId
                         } catch (e: Exception) {
                         }
                         if ((t > 0) && (t <= 10000)) {
-                            var mCameraManager = parent.getApplicationContext().getSystemService(Context.CAMERA_SERVICE) as CameraManager
+                            var mCameraManager = parent.applicationContext.getSystemService(Context.CAMERA_SERVICE) as CameraManager
                             try {
-                                var mCameraId = mCameraManager.getCameraIdList()[0];
+                                var mCameraId = mCameraManager.cameraIdList[0];
                                 mCameraManager.setTorchMode(mCameraId, true);
                                 thread {
                                     Thread.sleep(t)
diff --git a/app/src/main/java/com/meshcentral/agent/MeshFirebaseMessagingService.kt b/app/src/main/java/com/meshcentral/agent/MeshFirebaseMessagingService.kt
index 89957a8..ba6ddce 100644
--- a/app/src/main/java/com/meshcentral/agent/MeshFirebaseMessagingService.kt
+++ b/app/src/main/java/com/meshcentral/agent/MeshFirebaseMessagingService.kt
@@ -44,7 +44,7 @@ class MeshFirebaseMessagingService : FirebaseMessagingService() {
         }
 
         // The data is empty or the server is not set, bad notification.
-        if ((remoteMessage.data == null) || (remoteMessage.data["shash"] == null) || (serverLink == null) || (remoteMessage.data["shash"]!!.length < 12)) return;
+        if ((remoteMessage.data["shash"] == null) || (serverLink == null) || (remoteMessage.data["shash"]!!.length < 12)) return;
 
         // Check the server's agent hash against the notification.
         var x : List<String> = serverLink!!.split(',')
@@ -76,7 +76,7 @@ class MeshFirebaseMessagingService : FirebaseMessagingService() {
                 println("Showing notification with URL: $url");
                 g_mainActivity?.showNotification(remoteMessage.notification?.title, remoteMessage.notification?.body, url)
             }
-        } else if (remoteMessage.data != null) {
+        } else {
             var cmd : String? = remoteMessage.data["con"]
             var session : String? = remoteMessage.data["s"]
             var relayId : String? = remoteMessage.data["r"]
@@ -144,12 +144,13 @@ class MeshFirebaseMessagingService : FirebaseMessagingService() {
                     var t : Long = 0
                     try { t = splitCmd[1].toLong() } catch (e : Exception) {}
                     if ((t > 0) && (t <= 10000)) {
+                        @Suppress("DEPRECATION")
                         val v = g_mainActivity!!.getApplicationContext()
-                                .getSystemService(Context.VIBRATOR_SERVICE) as Vibrator
+                                .getSystemService(Context.VIBRATOR_SERVICE) as? Vibrator
                         if (v == null) {
                             r = "Not supported"
                         } else {
-                            // Vibrate for 500 milliseconds
+                            // Vibrate for t milliseconds
                             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
                                 v.vibrate(
                                         VibrationEffect.createOneShot(
@@ -158,6 +159,7 @@ class MeshFirebaseMessagingService : FirebaseMessagingService() {
                                         )
                                 )
                             } else {
+                                @Suppress("DEPRECATION")
                                 v.vibrate(t)
                             }
                             r = "ok"
@@ -238,7 +240,7 @@ class MeshFirebaseMessagingService : FirebaseMessagingService() {
                 var s = JSONArray()
                 var count = 0
                 for (j in n.interfaceAddresses) {
-                    var mac = n.hardwareAddress.toHex().toUpperCase()
+                    var mac = n.hardwareAddress.toHex().uppercase()
                     var mac2 = mac.substring(0,2) + ":" + mac.substring(2,4) + ":" + mac.substring(4,6) + ":" + mac.substring(6,8) + ":" + mac.substring(8,10) + ":" + mac.substring(10, 12)
                     var x = JSONObject()
                     x.put("address", j.address.hostAddress)
@@ -248,7 +250,7 @@ class MeshFirebaseMessagingService : FirebaseMessagingService() {
                     } else {
                         x.put("status", "down")
                     }
-                    if (j.address.hostAddress.indexOf(':') >= 0) {
+                    if (j.address.hostAddress?.indexOf(':') ?: -1 >= 0) {
                         x.put("family", "IPv6")
                     } else {
                         x.put("family", "IPv4")
diff --git a/app/src/main/java/com/meshcentral/agent/MeshTunnel.kt b/app/src/main/java/com/meshcentral/agent/MeshTunnel.kt
index 793494e..1995823 100644
--- a/app/src/main/java/com/meshcentral/agent/MeshTunnel.kt
+++ b/app/src/main/java/com/meshcentral/agent/MeshTunnel.kt
@@ -42,10 +42,7 @@ class PendingActivityData(tunnel: MeshTunnel, id: Int, url: Uri, where: String,
     var req : JSONObject = req
 }
 
-class MeshTunnel(parent: MeshAgent, url: String, serverData: JSONObject) : WebSocketListener() {
-    private var parent : MeshAgent = parent
-    private var url:String = url
-    private var serverData: JSONObject = serverData
+class MeshTunnel(private var parent: MeshAgent, private var url: String, private var serverData: JSONObject) : WebSocketListener() {
     private var serverTlsCertHash: ByteArray? = null
     private var connectionTimer: CountDownTimer? = null
     var _webSocket: WebSocket? = null
@@ -66,7 +63,7 @@ class MeshTunnel(parent: MeshAgent, url: String, serverData: JSONObject) : WebSo
 
     fun Start() {
         //println("MeshTunnel Init: ${serverData.toString()}")
-        var serverTlsCertHashHex = serverData.optString("servertlshash")
+        val serverTlsCertHashHex = serverData.optString("servertlshash")
         serverTlsCertHash = parent.hexToByteArray(serverTlsCertHashHex)
         //var tunnelUsage = serverData.getInt("usage")
         //var tunnelUser = serverData.getString("username")
@@ -106,11 +103,11 @@ class MeshTunnel(parent: MeshAgent, url: String, serverData: JSONObject) : WebSo
             }
 
             override fun checkServerTrusted(chain: Array<out X509Certificate>?, authType: String?) {
-                var hash =
-                        MessageDigest.getInstance("SHA-384").digest(chain?.get(0)?.encoded).toHex()
-                if ((serverTlsCertHash != null) && (hash.equals(serverTlsCertHash?.toHex()))) return
-                if (hash.equals(parent.serverTlsCertHash?.toHex())) return
-                println("Got Bad Tunnel TlsHash: ${hash}")
+                val encoded = chain?.get(0)?.encoded ?: throw CertificateException("No certificate")
+                val hash = MessageDigest.getInstance("SHA-384").digest(encoded).toHex()
+                if ((serverTlsCertHash != null) && (hash == serverTlsCertHash?.toHex())) return
+                if (hash == parent.serverTlsCertHash?.toHex()) return
+                println("Got Bad Tunnel TlsHash: $hash")
                 throw CertificateException()
             }
 
@@ -145,7 +142,7 @@ class MeshTunnel(parent: MeshAgent, url: String, serverData: JSONObject) : WebSo
             try {
                 _webSocket?.close(NORMAL_CLOSURE_STATUS, null)
                 _webSocket = null
-            } catch (ex: Exception) { }
+            } catch (_: Exception) { }
         }
         // Clear the connection timer
         if (connectionTimer != null) {
@@ -189,16 +186,16 @@ class MeshTunnel(parent: MeshAgent, url: String, serverData: JSONObject) : WebSo
         else if (state == 1) {
             // {"type":"options","file":"Images/1104105516.JPG"}
             if (text.startsWith('{')) {
-                var json = JSONObject(text)
-                var type = json.optString("type")
+                val json = JSONObject(text)
+                val type = json.optString("type")
                 if (type == "options") { tunnelOptions = json }
             } else {
-                var xusage = text.toInt()
+                val xusage = text.toInt()
                 if (((xusage < 1) || (xusage > 5)) && (xusage != 10)) {
                     println("Invalid usage $text"); stopSocket(); return
                 }
-                var serverExpectedUsage = serverData.optInt("usage")
-                if ((serverExpectedUsage != null) && (serverExpectedUsage != xusage) && (serverExpectedUsage == null)) {
+                val serverExpectedUsage = serverData.optInt("usage")
+                if ((serverExpectedUsage != 0) && (serverExpectedUsage != xusage)) {
                     println("Unexpected usage $text != $serverExpectedUsage");
                     stopSocket(); return
                 }
@@ -242,7 +239,7 @@ class MeshTunnel(parent: MeshAgent, url: String, serverData: JSONObject) : WebSo
                         println("No file transfer options");
                         stopSocket();
                     } else {
-                        var filename = tunnelOptions?.optString("file")
+                        val filename = tunnelOptions?.optString("file")
                         if (filename == null) {
                             println("No file transfer name");
                             stopSocket();
@@ -256,32 +253,32 @@ class MeshTunnel(parent: MeshAgent, url: String, serverData: JSONObject) : WebSo
         }
     }
 
-    override fun onMessage(webSocket: WebSocket, msg: ByteString) {
-        //println("Tunnel-onBinaryMessage: ${msg.size}, ${msg.toByteArray().toHex()}")
-        if ((state != 2) || (msg.size < 2)) return;
+    override fun onMessage(webSocket: WebSocket, bytes: ByteString) {
+        //println("Tunnel-onBinaryMessage: ${bytes.size}, ${bytes.toByteArray().toHex()}")
+        if ((state != 2) || (bytes.size < 2)) return;
         try {
-            if (msg[0].toInt() == 123) {
+            if (bytes[0].toInt() == 123) {
                 // If we are authenticated, process JSON data
-                processTunnelData(String(msg.toByteArray(), Charsets.UTF_8))
+                processTunnelData(String(bytes.toByteArray(), Charsets.UTF_8))
             } else if (fileUpload != null) {
                 // If this is file upload data, process it here
-                if (msg[0].toInt() == 0) {
+                if (bytes[0].toInt() == 0) {
                     // If data starts with zero, skip the first byte. This is used to escape binary file data from JSON.
-                    fileUploadSize += (msg.size - 1);
-                    var buf = msg.toByteArray()
+                    fileUploadSize += (bytes.size - 1);
+                    val buf = bytes.toByteArray()
                     try {
                         fileUpload?.write(buf, 1, buf.size - 1)
-                    } catch (ex : Exception) {
+                    } catch (_ : Exception) {
                         // Report a problem
                         uploadError()
                         return
                     }
                 } else {
                     // If data does not start with zero, save as-is.
-                    fileUploadSize += msg.size;
+                    fileUploadSize += bytes.size;
                     try {
-                        fileUpload?.write(msg.toByteArray())
-                    } catch (ex : Exception) {
+                        fileUpload?.write(bytes.toByteArray())
+                    } catch (_ : Exception) {
                         // Report a problem
                         uploadError()
                         return
@@ -294,12 +291,12 @@ class MeshTunnel(parent: MeshAgent, url: String, serverData: JSONObject) : WebSo
                 json.put("reqid", fileUploadReqId)
                 if (_webSocket != null) { _webSocket?.send(json.toString().toByteArray().toByteString()) }
             } else {
-                if (msg.size < 2) return
-                var cmd : Int = (msg[0].toInt() shl 8) + msg[1].toInt()
-                var cmdsize : Int = (msg[2].toInt() shl 8) + msg[3].toInt()
-                if (cmdsize != msg.size) return
-                //println("Cmd $cmd, Size: ${msg.size}, Hex: ${msg.toByteArray().toHex()}")
-                if (usage == 2) processBinaryDesktopCmd(cmd, cmdsize, msg) // Remote desktop
+                if (bytes.size < 2) return
+                val cmd : Int = (bytes[0].toInt() shl 8) + bytes[1].toInt()
+                val cmdsize : Int = (bytes[2].toInt() shl 8) + bytes[3].toInt()
+                if (cmdsize != bytes.size) return
+                //println("Cmd $cmd, Size: ${bytes.size}, Hex: ${bytes.toByteArray().toHex()}")
+                if (usage == 2) processBinaryDesktopCmd(cmd, cmdsize, bytes) // Remote desktop
             }
         }
         catch (e: Exception) {
@@ -358,7 +355,7 @@ class MeshTunnel(parent: MeshAgent, url: String, serverData: JSONObject) : WebSo
         }
 
         // Send the display size command
-        var bytesOut = ByteArrayOutputStream()
+        val bytesOut = ByteArrayOutputStream()
         DataOutputStream(bytesOut).use { dos ->
             with(dos) {
                 writeShort(7) // Screen size command
@@ -375,9 +372,7 @@ class MeshTunnel(parent: MeshAgent, url: String, serverData: JSONObject) : WebSo
         parent.parent.runOnUiThread {
             connectionTimer = object: CountDownTimer(120000000, 120000) {
                 override fun onTick(millisUntilFinished: Long) {
-                    if (_webSocket != null) {
-                        _webSocket?.send(ByteArray(1).toByteString()) // If not, sent a single zero byte
-                    }
+                    _webSocket?.send(ByteArray(1).toByteString()) // If not, sent a single zero byte
                 }
                 override fun onFinish() { startConnectionTimer() }
             }
@@ -389,22 +384,21 @@ class MeshTunnel(parent: MeshAgent, url: String, serverData: JSONObject) : WebSo
         val json = JSONObject()
         json.put("action", "uploaderror")
         json.put("reqid", fileUploadReqId)
-        if (_webSocket != null) { _webSocket?.send(json.toString().toByteArray().toByteString()) }
-        try { fileUpload?.close() } catch (ex : Exception) {}
+        _webSocket?.send(json.toString().toByteArray().toByteString())
+        try { fileUpload?.close() } catch (_ : Exception) {}
         fileUpload = null
-        return
     }
 
     private fun processTunnelData(jsonStr: String) {
         //println("JSON: $jsonStr")
         val json = JSONObject(jsonStr)
-        var action = json.getString("action")
+        val action = json.getString("action")
         //println("action: $action")
         when (action) {
             "ls" -> {
                 val path = json.getString("path")
                 if (path == "") {
-                    var r: JSONArray = JSONArray()
+                    val r: JSONArray = JSONArray()
                     r.put(JSONObject("{n:\"Sdcard\",t:2}"))
                     r.put(JSONObject("{n:\"Images\",t:2}"))
                     r.put(JSONObject("{n:\"Audio\",t:2}"))
@@ -415,9 +409,7 @@ class MeshTunnel(parent: MeshAgent, url: String, serverData: JSONObject) : WebSo
                     lastDirRequest = json; // Bit of a hack, but use this to refresh after a file delete
                     json.put("dir", getFolder(path))
                 }
-                if (_webSocket != null) {
-                    _webSocket?.send(json.toString().toByteArray(Charsets.UTF_8).toByteString())
-                }
+                _webSocket?.send(json.toString().toByteArray(Charsets.UTF_8).toByteString())
             }
             "rm" -> {
                 val path = json.getString("path")
@@ -453,9 +445,9 @@ class MeshTunnel(parent: MeshAgent, url: String, serverData: JSONObject) : WebSo
                     }
                 } else {
                     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-                        val resolver: ContentResolver = parent.parent.getContentResolver()
+                        val resolver: ContentResolver = parent.parent.contentResolver
                         val contentValues = ContentValues()
-                        var fileUri: Uri? = null
+                        val fileUri: Uri?
                         contentValues.put(MediaStore.MediaColumns.DISPLAY_NAME, name)
                         val (mimeType, relativePath, externalUri) = when {
                             name.lowercase().endsWith(".jpg") || name.lowercase().endsWith(".jpeg") -> Triple("image/jpg", Environment.DIRECTORY_PICTURES, MediaStore.Images.Media.EXTERNAL_CONTENT_URI)
@@ -502,10 +494,10 @@ class MeshTunnel(parent: MeshAgent, url: String, serverData: JSONObject) : WebSo
                 }
 
                 // Send response
-                val json = JSONObject()
-                json.put("action", "uploadstart")
-                json.put("reqid", reqid)
-                if (_webSocket != null) { _webSocket?.send(json.toString().toByteArray().toByteString()) }
+                val jsonResponse = JSONObject()
+                jsonResponse.put("action", "uploadstart")
+                jsonResponse.put("reqid", reqid)
+                if (_webSocket != null) { _webSocket?.send(jsonResponse.toString().toByteArray().toByteString()) }
             }
             "uploaddone" -> {
                 if (fileUpload == null) return;
@@ -513,13 +505,13 @@ class MeshTunnel(parent: MeshAgent, url: String, serverData: JSONObject) : WebSo
                 fileUpload = null;
 
                 // Send response
-                val json = JSONObject()
-                json.put("action", "uploaddone")
-                json.put("reqid", fileUploadReqId)
-                if (_webSocket != null) { _webSocket?.send(json.toString().toByteArray().toByteString()) }
+                val jsonResponse = JSONObject()
+                jsonResponse.put("action", "uploaddone")
+                jsonResponse.put("reqid", fileUploadReqId)
+                if (_webSocket != null) { _webSocket?.send(jsonResponse.toString().toByteArray().toByteString()) }
 
                 // Event the server
-                var eventArgs = JSONArray()
+                val eventArgs = JSONArray()
                 eventArgs.put(fileUploadName)
                 eventArgs.put(fileUploadSize)
                 parent.logServerEventEx(105, eventArgs, "Upload: \"${fileUploadName}}\", Size: $fileUploadSize", serverData);
@@ -542,16 +534,16 @@ class MeshTunnel(parent: MeshAgent, url: String, serverData: JSONObject) : WebSo
         )
         var uri : Uri? = null;
         if (dir.startsWith("Sdcard")) { uri = Uri.fromFile(Environment.getExternalStorageDirectory()) }
-        if (dir.equals("Images")) { uri = MediaStore.Images.Media.EXTERNAL_CONTENT_URI }
-        if (dir.equals("Audio")) { uri = MediaStore.Audio.Media.EXTERNAL_CONTENT_URI }
-        if (dir.equals("Videos")) { uri = MediaStore.Video.Media.EXTERNAL_CONTENT_URI }
+        if (dir == "Images") { uri = MediaStore.Images.Media.EXTERNAL_CONTENT_URI }
+        if (dir == "Audio") { uri = MediaStore.Audio.Media.EXTERNAL_CONTENT_URI }
+        if (dir == "Videos") { uri = MediaStore.Video.Media.EXTERNAL_CONTENT_URI }
         //if (dir == "Documents") { uri = MediaStore.Files. }
         if (uri == null) { return r }
         if (dir.startsWith("Sdcard")) {
             val path = dir.replaceFirst("Sdcard", Environment.getExternalStorageDirectory().absolutePath)
-            val listOfFiles = File(path).listFiles()
+            val listOfFiles = File(path).listFiles() ?: emptyArray()
             for (file in listOfFiles) {
-                var f : JSONObject = JSONObject()
+                val f = JSONObject()
                 f.put("n", file.name)
                 if (file.isDirectory) f.put("t", 2)
                 else f.put("t", 3)
@@ -561,7 +553,7 @@ class MeshTunnel(parent: MeshAgent, url: String, serverData: JSONObject) : WebSo
                 r.put(f)
             }
         } else {
-        val cursor: Cursor? = parent.parent.getContentResolver().query(
+        val cursor: Cursor? = parent.parent.contentResolver.query(
                 uri,
                 projection,
                 null,
@@ -574,7 +566,7 @@ class MeshTunnel(parent: MeshAgent, url: String, serverData: JSONObject) : WebSo
             val sizeColumn: Int = cursor.getColumnIndexOrThrow(MediaStore.MediaColumns.SIZE)
             //val typeColumn: Int = cursor.getColumnIndexOrThrow(MediaStore.MediaColumns.MIME_TYPE)
             while (cursor.moveToNext()) {
-                var f : JSONObject = JSONObject()
+                val f = JSONObject()
                 f.put("n", cursor.getString(titleColumn))
                 f.put("t", 3)
                 f.put("s", cursor.getInt(sizeColumn))
@@ -588,7 +580,7 @@ class MeshTunnel(parent: MeshAgent, url: String, serverData: JSONObject) : WebSo
     }
 
     fun deleteFile(path: String, filenames: JSONArray, req: JSONObject) {
-        var fileArray:ArrayList<String> = ArrayList<String>()
+        val fileArray:ArrayList<String> = ArrayList<String>()
         for (i in 0 until filenames.length()) { fileArray.add(filenames.getString(i)) }
 
         val projection = arrayOf(
@@ -598,14 +590,14 @@ class MeshTunnel(parent: MeshAgent, url: String, serverData: JSONObject) : WebSo
         )
         var uri : Uri? = null;
         if (path.startsWith("Sdcard")) { uri = Uri.fromFile(Environment.getExternalStorageDirectory()) }
-        if (path.equals("Images")) { uri = MediaStore.Images.Media.EXTERNAL_CONTENT_URI }
-        if (path.equals("Audio")) { uri = MediaStore.Audio.Media.EXTERNAL_CONTENT_URI }
-        if (path.equals("Videos")) { uri = MediaStore.Video.Media.EXTERNAL_CONTENT_URI }
+        if (path == "Images") { uri = MediaStore.Images.Media.EXTERNAL_CONTENT_URI }
+        if (path == "Audio") { uri = MediaStore.Audio.Media.EXTERNAL_CONTENT_URI }
+        if (path == "Videos") { uri = MediaStore.Video.Media.EXTERNAL_CONTENT_URI }
         //if (filenameSplit[0] == "Documents") { uri = MediaStore.Files. }
         if (uri == null) return
 
         if (path.startsWith("Sdcard")) {
-            var filePath = path.replaceFirst("Sdcard", Environment.getExternalStorageDirectory().absolutePath)
+            val filePath = path.replaceFirst("Sdcard", Environment.getExternalStorageDirectory().absolutePath)
             try {
                 for (i in 0 until filenames.length())
                 {
@@ -625,7 +617,7 @@ class MeshTunnel(parent: MeshAgent, url: String, serverData: JSONObject) : WebSo
                 fileDeleteResponse(req, false) // Send failure
             }
         } else {
-            val cursor: Cursor? = parent.parent.getContentResolver().query(
+            val cursor: Cursor? = parent.parent.contentResolver.query(
                 uri,
                 projection,
                 null,
@@ -636,14 +628,14 @@ class MeshTunnel(parent: MeshAgent, url: String, serverData: JSONObject) : WebSo
                 val idColumn: Int = cursor.getColumnIndexOrThrow(MediaStore.MediaColumns._ID)
                 val titleColumn: Int = cursor.getColumnIndexOrThrow(MediaStore.MediaColumns.DISPLAY_NAME)
                 //val sizeColumn: Int = cursor.getColumnIndexOrThrow(MediaStore.MediaColumns.SIZE)
-                var fileidArray:ArrayList<String> = ArrayList<String>()
-                var fileUriArray:ArrayList<Uri> = ArrayList<Uri>()
+                val fileidArray:ArrayList<String> = ArrayList<String>()
+                val fileUriArray:ArrayList<Uri> = ArrayList<Uri>()
                 while (cursor.moveToNext()) {
-                    var name = cursor.getString(titleColumn)
+                    val name = cursor.getString(titleColumn)
                     if (fileArray.contains(name)) {
-                        var id = cursor.getString(idColumn)
-                        var contentUrl: Uri = ContentUris.withAppendedId(uri, cursor.getLong(idColumn))
-                        //var fileSize = cursor.getInt(sizeColumn)
+                        val id = cursor.getString(idColumn)
+                        val contentUrl: Uri = ContentUris.withAppendedId(uri, cursor.getLong(idColumn))
+                        //val fileSize = cursor.getInt(sizeColumn)
                         fileidArray.add(id)
                         fileUriArray.add(contentUrl)
                     }
@@ -658,22 +650,13 @@ class MeshTunnel(parent: MeshAgent, url: String, serverData: JSONObject) : WebSo
                                 securityException as? RecoverableSecurityException
                                     ?: throw securityException
 
-                            // Save the activity
-                            var activityCode = Random.nextInt() and 0xFFFF
-                            var pad = PendingActivityData(this, activityCode, fileUriArray[0], "${MediaStore.Images.Media._ID} = ?", fileidArray[0], req)
-                            pendingActivities.add(pad)
+                            // Create pending activity data
+                            val activityCode = Random.nextInt() and 0xFFFF
+                            val pad = PendingActivityData(this, activityCode, fileUriArray[0], "${MediaStore.Images.Media._ID} = ?", fileidArray[0], req)
 
-                            // Launch the activity
+                            // Launch the activity using the modern Activity Result API
                             val intentSender = recoverableSecurityException.userAction.actionIntent.intentSender
-                            parent.parent.startIntentSenderForResult(
-                                intentSender,
-                                activityCode,
-                                null,
-                                0,
-                                0,
-                                0,
-                                null
-                            )
+                            parent.parent.launchIntentSenderForResult(intentSender, pad)
                         } else {
                             fileDeleteResponse(req, false) // Send fail
                         }
@@ -693,7 +676,7 @@ class MeshTunnel(parent: MeshAgent, url: String, serverData: JSONObject) : WebSo
     }
 
     fun startFileTransfer(filename: String) {
-        var filenameSplit = filename.split('/')
+        val filenameSplit = filename.split('/')
         //println("startFileTransfer: $filenameSplit")
 
         val projection = arrayOf(
@@ -703,9 +686,9 @@ class MeshTunnel(parent: MeshAgent, url: String, serverData: JSONObject) : WebSo
         )
         var uri : Uri? = null;
         if (filenameSplit[0].startsWith("Sdcard")) { uri = Uri.fromFile(Environment.getExternalStorageDirectory()) }
-        if (filenameSplit[0].equals("Images")) { uri = MediaStore.Images.Media.EXTERNAL_CONTENT_URI }
-        if (filenameSplit[0].equals("Audio")) { uri = MediaStore.Audio.Media.EXTERNAL_CONTENT_URI }
-        if (filenameSplit[0].equals("Videos")) { uri = MediaStore.Video.Media.EXTERNAL_CONTENT_URI }
+        if (filenameSplit[0] == "Images") { uri = MediaStore.Images.Media.EXTERNAL_CONTENT_URI }
+        if (filenameSplit[0] == "Audio") { uri = MediaStore.Audio.Media.EXTERNAL_CONTENT_URI }
+        if (filenameSplit[0] == "Videos") { uri = MediaStore.Video.Media.EXTERNAL_CONTENT_URI }
         //if (filenameSplit[0] == "Documents") { uri = MediaStore.Files. }
         if (uri == null) { stopSocket(); return }
         if (filenameSplit[0].startsWith("Sdcard")){
@@ -714,16 +697,16 @@ class MeshTunnel(parent: MeshAgent, url: String, serverData: JSONObject) : WebSo
             if (file.exists()) {
                 val fileName = file.name
                 val fileSize = file.length()
-                var eventArgs = JSONArray()
+                val eventArgs = JSONArray()
                 eventArgs.put(fileName)
                 eventArgs.put(fileSize)
-                parent.logServerEventEx(106, eventArgs, "Download: ${fileName}, Size: $fileSize", serverData);
+                parent.logServerEventEx(106, eventArgs, "Download: $fileName, Size: $fileSize", serverData)
                 val contentUrl = Uri.fromFile(file)
                 try {
                     // Serve the file
-                    parent.parent.getContentResolver().openInputStream(contentUrl).use { stream ->
+                    parent.parent.contentResolver.openInputStream(contentUrl).use { stream ->
                             // Perform operation on stream
-                            var buf = ByteArray(65535)
+                            val buf = ByteArray(65535)
                             var len : Int
                             while (true) {
                                 len = stream!!.read(buf, 0, 65535)
@@ -733,7 +716,7 @@ class MeshTunnel(parent: MeshAgent, url: String, serverData: JSONObject) : WebSo
                                 if (_webSocket?.queueSize()!! > 655350) { Thread.sleep(100)}
                             }
                         }
-                    return;
+                    return
                 } catch (e: FileNotFoundException) {
                     // file not found
                 }
@@ -741,7 +724,7 @@ class MeshTunnel(parent: MeshAgent, url: String, serverData: JSONObject) : WebSo
                 // file does not exist
             }
         } else {
-            val cursor: Cursor? = parent.parent.getContentResolver().query(
+            val cursor: Cursor? = parent.parent.contentResolver.query(
                     uri,
                     projection,
                     null,
@@ -753,21 +736,21 @@ class MeshTunnel(parent: MeshAgent, url: String, serverData: JSONObject) : WebSo
                 val titleColumn: Int = cursor.getColumnIndexOrThrow(MediaStore.MediaColumns.DISPLAY_NAME)
                 val sizeColumn: Int = cursor.getColumnIndexOrThrow(MediaStore.MediaColumns.SIZE)
                 while (cursor.moveToNext()) {
-                    var name = cursor.getString(titleColumn)
+                    val name = cursor.getString(titleColumn)
                     if (name == filenameSplit[1]) {
-                        var contentUrl: Uri = ContentUris.withAppendedId(uri, cursor.getLong(idColumn))
-                        var fileSize = cursor.getInt(sizeColumn)
+                        val contentUrl: Uri = ContentUris.withAppendedId(uri, cursor.getLong(idColumn))
+                        val fileSize = cursor.getInt(sizeColumn)
 
                         // Event to the server
-                        var eventArgs = JSONArray()
+                        val eventArgs = JSONArray()
                         eventArgs.put(filename)
                         eventArgs.put(fileSize)
-                        parent.logServerEventEx(106, eventArgs, "Download: ${filename}, Size: $fileSize", serverData);
+                        parent.logServerEventEx(106, eventArgs, "Download: $filename, Size: $fileSize", serverData)
 
                         // Serve the file
-                        parent.parent.getContentResolver().openInputStream(contentUrl).use { stream ->
+                        parent.parent.contentResolver.openInputStream(contentUrl).use { stream ->
                             // Perform operation on stream
-                            var buf = ByteArray(65535)
+                            val buf = ByteArray(65535)
                             var len : Int
                             while (true) {
                                 len = stream!!.read(buf, 0, 65535)
@@ -777,7 +760,7 @@ class MeshTunnel(parent: MeshAgent, url: String, serverData: JSONObject) : WebSo
                                 if (_webSocket?.queueSize()!! > 655350) { Thread.sleep(100)}
                             }
                         }
-                        return;
+                        return
                     }
                 }
             }
@@ -810,7 +793,7 @@ class MeshTunnel(parent: MeshAgent, url: String, serverData: JSONObject) : WebSo
         val path = req.getString("path")
         val filenames = req.getJSONArray("delfiles")
         if (filenames.length() == 1) {
-            var eventArgs = JSONArray()
+            val eventArgs = JSONArray()
             eventArgs.put(path + '/' + filenames[0])
             parent.logServerEventEx(45, eventArgs, "Delete: \"${path}/${filenames[0]}\"", serverData);
         }
diff --git a/app/src/main/java/com/meshcentral/agent/NotificationUtils.kt b/app/src/main/java/com/meshcentral/agent/NotificationUtils.kt
index 73209ee..afac1d5 100644
--- a/app/src/main/java/com/meshcentral/agent/NotificationUtils.kt
+++ b/app/src/main/java/com/meshcentral/agent/NotificationUtils.kt
@@ -42,7 +42,7 @@ object NotificationUtils {
         builder.setContentText(context.getString(com.meshcentral.agent.R.string.displaysharing))
         builder.setOngoing(true)
         builder.setCategory(Notification.CATEGORY_SERVICE)
-        builder.priority = Notification.PRIORITY_LOW
+        builder.priority = NotificationCompat.PRIORITY_LOW
         builder.setShowWhen(true)
         return builder.build()
     }
diff --git a/app/src/main/java/com/meshcentral/agent/ScreenCaptureService.kt b/app/src/main/java/com/meshcentral/agent/ScreenCaptureService.kt
index e27cc29..1f8005d 100644
--- a/app/src/main/java/com/meshcentral/agent/ScreenCaptureService.kt
+++ b/app/src/main/java/com/meshcentral/agent/ScreenCaptureService.kt
@@ -17,6 +17,7 @@ import android.media.ImageReader
 import android.media.ImageReader.OnImageAvailableListener
 import android.media.projection.MediaProjection
 import android.media.projection.MediaProjectionManager
+import android.os.Build
 import android.os.CountDownTimer
 import android.os.Handler
 import android.os.IBinder
@@ -77,7 +78,7 @@ class ScreenCaptureService : Service() {
 
                     // Create the bitmap
                     bitmap = Bitmap.createBitmap(mWidth + rowPadding / pixelStride, mHeight, Bitmap.Config.ARGB_8888)
-                    bitmap!!.copyPixelsFromBuffer(buffer)
+                    bitmap.copyPixelsFromBuffer(buffer)
 
                     // Resize the bitmap if needed
                     if (g_desktop_scalingLevel != 1024) {
@@ -349,7 +350,7 @@ class ScreenCaptureService : Service() {
         object : Thread() {
             override fun run() {
                 Looper.prepare()
-                mHandler = Handler()
+                mHandler = Handler(Looper.myLooper()!!)
                 Looper.loop()
             }
         }.start()
@@ -362,7 +363,12 @@ class ScreenCaptureService : Service() {
             startForeground(notification.first!!, notification.second)
             // Start projection
             val resultCode = intent.getIntExtra(ScreenCaptureService.Companion.RESULT_CODE, Activity.RESULT_CANCELED)
-            val data = intent.getParcelableExtra<Intent>(ScreenCaptureService.Companion.DATA)
+            val data = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+                intent.getParcelableExtra(ScreenCaptureService.Companion.DATA, Intent::class.java)
+            } else {
+                @Suppress("DEPRECATION")
+                intent.getParcelableExtra(ScreenCaptureService.Companion.DATA)
+            }
             startProjection(resultCode, data)
         } else if (ScreenCaptureService.Companion.isStopCommand(intent)) {
             stopProjection()
@@ -390,6 +396,7 @@ class ScreenCaptureService : Service() {
                     val displayManager = applicationContext.getSystemService(DISPLAY_SERVICE) as DisplayManager
                     mDisplay = displayManager.getDisplay(Display.DEFAULT_DISPLAY)
                 } else {
+                    @Suppress("DEPRECATION")
                     mDisplay = windowManager.defaultDisplay
                 }
 
diff --git a/app/src/main/res/layout-land/fragment_auth.xml b/app/src/main/res/layout-land/fragment_auth.xml
index 05d9312..f847724 100644
--- a/app/src/main/res/layout-land/fragment_auth.xml
+++ b/app/src/main/res/layout-land/fragment_auth.xml
@@ -29,8 +29,9 @@
         android:layout_marginStart="32dp"
         android:contentDescription="@string/authenticating"
         android:src="@mipmap/ic_launcher_foreground"
+        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        tools:layout_editor_absoluteY="82dp" />
+        app:layout_constraintTop_toTopOf="parent" />
 
     <Button
         android:id="@+id/authAcceptButton"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e4a6ccd..0251181 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -62,5 +62,6 @@
     <string name="setup_message">Setup to: %1$s?</string>
     <string name="clear_server_setup">Clear server setup?</string>
     <string name="server_pairing_link">Server Pairing Link</string>
-    <string name="invalid_server_pairing_link">Invalid Server Pairing Linbk</string>
+    <string name="invalid_server_pairing_link">Invalid Server Pairing Link</string>
+    <string name="zero_string" translatable="false">000000</string>
 </resources>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 27b203c..70ae02d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,14 +1,14 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
-    ext.kotlin_version = '1.9.10'
+    ext.kotlin_version = '2.3.0'
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.1.2'
+        classpath 'com.android.tools.build:gradle:8.13.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath 'com.google.gms:google-services:4.4.0'
+        classpath 'com.google.gms:google-services:4.4.4'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -18,10 +18,11 @@ buildscript {
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
+        maven { url = "https://jitpack.io" }
     }
 }
 
-task clean(type: Delete) {
-    delete rootProject.buildDir
-}
\ No newline at end of file
+tasks.register('clean', Delete) {
+    delete rootProject.layout.buildDirectory
+}
diff --git a/gradle.properties b/gradle.properties
index 9bba2f4..30bde58 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -19,10 +19,12 @@ android.useAndroidX=true
 android.enableJetifier=true
 # Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official
-android.defaults.buildfeatures.buildconfig=true
 android.nonTransitiveRClass=false
 android.nonFinalResIds=false
 
 
 # Enable more aggressive optimizations
-# android.enableR8.fullMode=true
\ No newline at end of file
+# android.enableR8.fullMode=true
+
+org.gradle.warning.mode=all
+android.lint.checkReleaseBuilds=false
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index da1db5f..d41769f 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
+#Thu Dec 18 14:17:37 AEDT 2025
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists