Hesham/wireguard-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ui: do not crash if tunnel preparation fails

Browse Source 
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
This commit is contained in:
Jason A. Donenfeld 2023-04-03 19:37:51 +02:00
parent 59da677c23
commit 9fa8ca8c77
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ui/src/main/java/com/wireguard/android/fragment/BaseFragment.kt
View File

@ -67,6 +67,7 @@ abstract class BaseFragment : Fragment(), OnSelectedTunnelChangedListener {
val activity = activity ?: return val activity = activity ?: return
activity.lifecycleScope.launch { activity.lifecycleScope.launch {
if (Application.getBackend() is GoBackend) { if (Application.getBackend() is GoBackend) {
try {
val intent = GoBackend.VpnService.prepare(activity) val intent = GoBackend.VpnService.prepare(activity)
if (intent != null) { if (intent != null) {
pendingTunnel = tunnel pendingTunnel = tunnel
@ -74,6 +75,13 @@ abstract class BaseFragment : Fragment(), OnSelectedTunnelChangedListener {
permissionActivityResultLauncher.launch(intent) permissionActivityResultLauncher.launch(intent)
return@launch return@launch
} }
} catch (e: Throwable) {
val message = activity.getString(R.string.error_prepare, ErrorMessages[e])
Snackbar.make(view, message, Snackbar.LENGTH_LONG)
.setAnchorView(view.findViewById(R.id.create_fab))
.show()
Log.e(TAG, message, e)
}
} }
setTunnelStateWithPermissionsResult(tunnel, checked) setTunnelStateWithPermissionsResult(tunnel, checked)
} }

1
ui/src/main/res/values/strings.xml
View File

@ -120,6 +120,7 @@
<string name="error_down">Error bringing down tunnel: %s</string> <string name="error_down">Error bringing down tunnel: %s</string>
<string name="error_fetching_apps">Error fetching apps list: %s</string> <string name="error_fetching_apps">Error fetching apps list: %s</string>
<string name="error_root">Please obtain root access and try again</string> <string name="error_root">Please obtain root access and try again</string>
<string name="error_prepare">Error preparing tunnel: %s</string>
<string name="error_up">Error bringing up tunnel: %s</string> <string name="error_up">Error bringing up tunnel: %s</string>
<string name="exclude_private_ips">Exclude private IPs</string> <string name="exclude_private_ips">Exclude private IPs</string>
<string name="generate_new_private_key">Generate new private key</string> <string name="generate_new_private_key">Generate new private key</string>