diff --git a/android/src/main/java/com/tailscale/ipn/App.kt b/android/src/main/java/com/tailscale/ipn/App.kt index 90a9e24..0184910 100644 --- a/android/src/main/java/com/tailscale/ipn/App.kt +++ b/android/src/main/java/com/tailscale/ipn/App.kt @@ -93,9 +93,15 @@ class App : UninitializedApp(), libtailscale.AppContext { override fun onCreate() { super.onCreate() createNotificationChannel( - STATUS_CHANNEL_ID, "VPN Status", NotificationManagerCompat.IMPORTANCE_LOW) + STATUS_CHANNEL_ID, + getString(R.string.vpn_status), + getString(R.string.optional_notifications_which_display_the_status_of_the_vpn_tunnel), + NotificationManagerCompat.IMPORTANCE_MIN) createNotificationChannel( - FILE_CHANNEL_ID, "File transfers", NotificationManagerCompat.IMPORTANCE_DEFAULT) + FILE_CHANNEL_ID, + getString(R.string.taildrop_file_transfers), + getString(R.string.notifications_delivered_when_a_file_is_received_using_taildrop), + NotificationManagerCompat.IMPORTANCE_DEFAULT) appInstance = this setUnprotectedInstance(this) } @@ -393,8 +399,9 @@ open class UninitializedApp : Application() { startService(intent) } - fun createNotificationChannel(id: String?, name: String?, importance: Int) { + fun createNotificationChannel(id: String, name: String, description: String, importance: Int) { val channel = NotificationChannel(id, name, importance) + channel.description = description val nm: NotificationManagerCompat = NotificationManagerCompat.from(this) nm.createNotificationChannel(channel) } diff --git a/android/src/main/java/com/tailscale/ipn/StartVPNWorker.java b/android/src/main/java/com/tailscale/ipn/StartVPNWorker.java index 5c95ae2..d75e3fa 100644 --- a/android/src/main/java/com/tailscale/ipn/StartVPNWorker.java +++ b/android/src/main/java/com/tailscale/ipn/StartVPNWorker.java @@ -45,7 +45,7 @@ public final class StartVPNWorker extends Worker { String channelId = "start_vpn_channel"; // Use createNotificationChannel method from App.java - app.createNotificationChannel(channelId, "Start VPN Channel", NotificationManager.IMPORTANCE_DEFAULT); + app.createNotificationChannel(channelId, getApplicationContext().getString(R.string.vpn_start), getApplicationContext().getString(R.string.notifications_delivered_when_user_interaction_is_required_to_establish_the_vpn_tunnel), NotificationManager.IMPORTANCE_HIGH); // Use prepareIntent if available. Intent intent = app.getPackageManager().getLaunchIntentForPackage(app.getPackageName()); diff --git a/android/src/main/res/values/strings.xml b/android/src/main/res/values/strings.xml index cee824e..f2cc400 100644 --- a/android/src/main/res/values/strings.xml +++ b/android/src/main/res/values/strings.xml @@ -246,4 +246,12 @@ Tailscale Connection Failed Tap here to open Tailscale. + + + Taildrop file transfers + VPN status + VPN start + Notifications delivered when user interaction is required to establish the VPN tunnel. + Optional notifications which display the status of the VPN tunnel. + Notifications delivered when a file is received using Taildrop.