fix: prevent crash from bad file config upload and bug preventing vpn from starting via watcher service after reboot

Add catch for file configs that are malformed and display message to the user

Pass full tunnel config to watcher service after detecting reboot to allow watcher service to start tunnel properly.

README.md

@@ -43,6 +43,7 @@ The inspiration for this app came from the inconvenience of constantly having to
 
 * Add tunnels via .conf file
 * Auto connect to VPN based on Wi-Fi SSID
+* Split tunneling by application
 * Configurable Trusted Network list 
 * Optional auto connect on mobile data
 * Automatic service restart after reboot

app/build.gradle.kts

@@ -17,7 +17,7 @@ android {
 
     val versionMajor = 2
     val versionMinor = 0
-    val versionPatch = 0
+    val versionPatch = 2
     val versionBuild = 0
 
     defaultConfig {

app/src/main/java/com/zaneschepke/wireguardautotunnel/BootReceiver.kt

@@ -36,7 +36,7 @@ class BootReceiver : BroadcastReceiver() {
                                 Action.START, context,
                                 WireGuardConnectivityWatcherService::class.java,
                                 mapOf(context.resources.getString(R.string.tunnel_extras_key) to
-                                defaultTunnel.id.toString())
+                                defaultTunnel.toString())
                             )
                         }
                     }

app/src/main/java/com/zaneschepke/wireguardautotunnel/service/foreground/ServiceTracker.kt

@@ -6,8 +6,8 @@ import android.app.Service
 import android.content.Context
 import android.content.Context.ACTIVITY_SERVICE
 import android.content.Intent
-import android.content.SharedPreferences
-import com.zaneschepke.wireguardautotunnel.R
+import com.google.firebase.crashlytics.ktx.crashlytics
+import com.google.firebase.ktx.Firebase
 
 object ServiceTracker {
     @Suppress("DEPRECATION")
@@ -31,7 +31,11 @@ object ServiceTracker {
             }
         }
         intent.component?.javaClass
-        application.startService(intent)
+        try {
+            application.startService(intent)
+        } catch (e : Exception) {
+            e.message?.let { Firebase.crashlytics.log(it) }
+        }
     }
 
     fun <T : Service> actionOnService(action: Action, context: Context, cls : Class<T>, extras : Map<String,String>? = null) {
@@ -43,6 +47,10 @@ object ServiceTracker {
             }
         }
         intent.component?.javaClass
-        context.startService(intent)
+        try {
+            context.startService(intent)
+        } catch (e : Exception) {
+            e.message?.let { Firebase.crashlytics.log(it) }
+        }
     }
 }

app/src/main/java/com/zaneschepke/wireguardautotunnel/service/foreground/WireGuardConnectivityWatcherService.kt

@@ -161,6 +161,7 @@ class WireGuardConnectivityWatcherService : ForegroundService() {
                     if(!isWifiConnected && vpnService.getState() == Tunnel.State.UP) stopVPN()
                     Timber.d("Lost mobile data connection")
                 }
+                else -> {}
             }
         }
     }
@@ -200,6 +201,7 @@ class WireGuardConnectivityWatcherService : ForegroundService() {
                             startVPN()
                         }
                     }
+                    else -> {}
                 }
             }
         }

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/main/MainViewModel.kt

@@ -7,6 +7,7 @@ import android.net.Uri
 import android.provider.OpenableColumns
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
+import com.wireguard.config.BadConfigException
 import com.wireguard.config.Config
 import com.zaneschepke.wireguardautotunnel.R
 import com.zaneschepke.wireguardautotunnel.repository.Repository
@@ -122,12 +123,18 @@ class MainViewModel @Inject constructor(private val application : Application,
         val stream = application.applicationContext.contentResolver.openInputStream(uri)
         stream ?: return
         val bufferReader = stream.bufferedReader(charset = Charsets.UTF_8)
-        val config = Config.parse(bufferReader)
-        val tunnelName = getNameFromFileName(fileName)
-        viewModelScope.launch {
-            tunnelRepo.save(TunnelConfig(name = tunnelName, wgQuick = config.toWgQuickString()))
+        try {
+            val config = Config.parse(bufferReader)
+            val tunnelName = getNameFromFileName(fileName)
+            viewModelScope.launch {
+                tunnelRepo.save(TunnelConfig(name = tunnelName, wgQuick = config.toWgQuickString()))
+            }
+            stream.close()
+        } catch(_: BadConfigException) {
+            viewModelScope.launch {
+                showSnackBarMessage(application.applicationContext.getString(R.string.bad_config))
+            }
         }
-        stream.close()
     }
 
     @SuppressLint("Range")

app/src/main/res/values/strings.xml

@@ -12,7 +12,7 @@
     <string name="turn_off_tunnel">Turn off tunnel before editing</string>
     <string name="no_tunnels">No tunnels added yet!</string>
     <string name="tunnel_exists">Tunnel name already exists</string>
-    <string name="discord_url">https://discord.gg/Ad5fuEts</string>
+    <string name="discord_url">https://discord.gg/rbRRNh6H7V</string>
     <string name="watcher_notification_title">Watcher Service</string>
     <string name="watcher_notification_text">Monitoring network state changes</string>
     <string name="tunnel_start_title">VPN Connected</string>
@@ -57,4 +57,5 @@
     <string name="no_thanks">No thanks</string>
     <string name="turn_on">Turn on</string>
     <string name="map">Map</string>
+    <string name="bad_config">Bad config. Please try again.</string>
 </resources>