Merge remote-tracking branch 'origin/master' into feat/auto-restart-v2

Author: naonak

.github/workflows/build-aab.yml

@@ -122,7 +122,7 @@ jobs:
           echo "path=$AAB_PATH" >> $GITHUB_OUTPUT
 
       - name: Upload AAB Artifact
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v7
         with:
           name: google-play-aab
           path: ${{ steps.aab-path.outputs.path }}

.github/workflows/build.yml

@@ -115,7 +115,7 @@ jobs:
         id: apk-path
         run: echo "path=$(find . -regex '^.*/build/outputs/apk/${{ inputs.flavor }}/${{ inputs.build_type }}/.*\.apk$' -type f | head -1 | tail -c+2)" >> $GITHUB_OUTPUT
       - name: Upload All APK Artifacts
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v7
         with:
           name: android_artifacts_${{ inputs.flavor }}
           path: >-

.github/workflows/nightly.yml

@@ -71,7 +71,7 @@ jobs:
         run: mkdir ${{ github.workspace }}/temp
 
       - name: Download artifacts
-        uses: actions/download-artifact@v7
+        uses: actions/download-artifact@v8
         with:
           pattern: android_artifacts_*
           path: ${{ github.workspace }}/temp

.github/workflows/publish.yml

@@ -115,7 +115,7 @@ jobs:
         run: mkdir ${{ github.workspace }}/temp
 
       - name: Download artifacts
-        uses: actions/download-artifact@v7
+        uses: actions/download-artifact@v8
         with:
           pattern: android_artifacts_*
           path: ${{ github.workspace }}/temp
@@ -240,4 +240,4 @@ jobs:
       - name: Distribute app to Prod track 🚀
         run: |
           track=${{ github.event_name == 'push' && 'production' || inputs.track }}
-          (cd ${{ github.workspace }} && bundle install && bundle exec fastlane $track)
+          (cd ${{ github.workspace }} && bundle install && bundle exec fastlane $track --verbose)

app/src/main/java/com/zaneschepke/wireguardautotunnel/core/notification/NotificationManager.kt

@@ -14,6 +14,7 @@ interface NotificationManager {
     fun createNotification(
         channel: NotificationChannels,
         title: String = "",
+        subText: String? = null,
         actions: Collection<NotificationCompat.Action> = emptyList(),
         description: String = "",
         showTimestamp: Boolean = true,
@@ -27,6 +28,7 @@ interface NotificationManager {
     fun createNotification(
         channel: NotificationChannels,
         title: StringValue,
+        subText: String? = null,
         actions: Collection<NotificationCompat.Action> = emptyList(),
         description: StringValue,
         showTimestamp: Boolean = true,

app/src/main/java/com/zaneschepke/wireguardautotunnel/core/notification/WireGuardNotification.kt

@@ -29,6 +29,7 @@ class WireGuardNotification(override val context: Context) : NotificationManager
     override fun createNotification(
         channel: NotificationChannels,
         title: String,
+        subText: String?,
         actions: Collection<NotificationCompat.Action>,
         description: String,
         showTimestamp: Boolean,
@@ -44,6 +45,7 @@ class WireGuardNotification(override val context: Context) : NotificationManager
             .apply {
                 actions.forEach { addAction(it) }
                 setContentTitle(title)
+                setSubText(subText)
                 setContentIntent(
                     PendingIntent.getActivity(
                         context,
@@ -72,6 +74,7 @@ class WireGuardNotification(override val context: Context) : NotificationManager
     override fun createNotification(
         channel: NotificationChannels,
         title: StringValue,
+        subText: String?,
         actions: Collection<NotificationCompat.Action>,
         description: StringValue,
         showTimestamp: Boolean,
@@ -84,6 +87,7 @@ class WireGuardNotification(override val context: Context) : NotificationManager
         return createNotification(
             channel,
             title.asString(context),
+            subText,
             actions,
             description.asString(context),
             showTimestamp,
@@ -109,7 +113,7 @@ class WireGuardNotification(override val context: Context) : NotificationManager
             )
         return NotificationCompat.Action.Builder(
                 R.drawable.ic_notification,
-                notificationAction.title(context).uppercase(),
+                notificationAction.title(context),
                 pendingIntent,
             )
             .build()
@@ -141,6 +145,7 @@ class WireGuardNotification(override val context: Context) : NotificationManager
                     context.getString(R.string.auto_tunnel_channel_id),
                 )
             }
+
             NotificationChannels.VPN -> {
                 NotificationCompat.Builder(context, context.getString(R.string.vpn_channel_id))
             }
@@ -157,6 +162,7 @@ class WireGuardNotification(override val context: Context) : NotificationManager
                     )
                     .apply { description = context.getString(R.string.vpn_channel_description) }
             }
+
             NotificationChannels.AUTO_TUNNEL -> {
                 NotificationChannel(
                         context.getString(R.string.auto_tunnel_channel_id),

app/src/main/java/com/zaneschepke/wireguardautotunnel/core/service/BaseTunnelForegroundService.kt

@@ -3,6 +3,7 @@ package com.zaneschepke.wireguardautotunnel.core.service
 import android.app.Notification
 import android.content.Intent
 import android.os.IBinder
+import android.text.format.Formatter
 import androidx.core.app.ServiceCompat
 import androidx.lifecycle.LifecycleService
 import androidx.lifecycle.lifecycleScope
@@ -17,6 +18,9 @@ import com.zaneschepke.wireguardautotunnel.domain.repository.GeneralSettingRepos
 import com.zaneschepke.wireguardautotunnel.domain.repository.TunnelRepository
 import com.zaneschepke.wireguardautotunnel.util.extensions.distinctByKeys
 import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.isActive
 import kotlinx.coroutines.launch
 import org.koin.android.ext.android.inject
 import org.koin.core.qualifier.named
@@ -25,19 +29,18 @@ import timber.log.Timber
 abstract class BaseTunnelForegroundService : LifecycleService(), TunnelService {
 
     private val notificationManager: NotificationManager by inject()
-
     private val serviceManager: ServiceManager by inject()
-
     private val tunnelManager: TunnelManager by inject()
-
     private val ioDispatcher: CoroutineDispatcher by inject(named(Dispatcher.IO))
-
     private val settingsRepository: GeneralSettingRepository by inject()
-
     private val tunnelsRepository: TunnelRepository by inject()
 
     protected abstract val fgsType: Int
 
+    private var currentSingleTunnelId: Int? = null
+
+    private var statsJob: Job? = null
+
     override fun onBind(intent: Intent): IBinder {
         super.onBind(intent)
         return LocalBinder(this)
@@ -55,12 +58,14 @@ abstract class BaseTunnelForegroundService : LifecycleService(), TunnelService {
 
     override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
         super.onStartCommand(intent, flags, startId)
+
         ServiceCompat.startForeground(
             this,
             NotificationManager.VPN_NOTIFICATION_ID,
             onCreateNotification(),
             fgsType,
         )
+
         if (
             intent == null ||
                 intent.component == null ||
@@ -79,28 +84,68 @@ abstract class BaseTunnelForegroundService : LifecycleService(), TunnelService {
         } else {
             start()
         }
+
         return START_STICKY
     }
 
     override fun start() {
         lifecycleScope.launch(ioDispatcher) {
             tunnelManager.activeTunnels.distinctByKeys().collect { activeTunnels ->
-                val activeTunConfigs = activeTunnels.keys
+                val activeTunIds = activeTunnels.keys
                 val tunnels = tunnelsRepository.getAll()
-                val activeConfigs = tunnels.filter { activeTunConfigs.contains(it.id) }
+                val activeConfigs = tunnels.filter { activeTunIds.contains(it.id) }
+
                 updateServiceNotification(activeConfigs)
+                restartStatsUpdaterIfNeeded(activeConfigs)
             }
         }
     }
 
-    // TODO Would be cool to have this include kill switch
+    private fun restartStatsUpdaterIfNeeded(activeConfigs: List<TunnelConfig>) {
+        val single = activeConfigs.singleOrNull()
+
+        if (single == null) {
+            statsJob?.cancel()
+            statsJob = null
+            currentSingleTunnelId = null
+            return
+        }
+
+        if (currentSingleTunnelId == single.id && statsJob?.isActive == true) return
+
+        statsJob?.cancel()
+        statsJob = null
+        currentSingleTunnelId = single.id
+
+        statsJob =
+            lifecycleScope.launch(ioDispatcher) {
+                while (isActive) {
+                    val traffic = readTraffic(single.id)
+
+                    notificationManager.show(
+                        NotificationManager.VPN_NOTIFICATION_ID,
+                        createTunnelNotification(single, consumedTraffic = traffic),
+                    )
+
+                    delay(1000)
+                }
+            }
+    }
+
+    private fun readTraffic(tunnelId: Int): Pair<Long, Long>? {
+        val active = tunnelManager.activeTunnels.value[tunnelId] ?: return null
+        val stats = active.statistics ?: return null
+        return stats.rx() to stats.tx()
+    }
+
     private fun updateServiceNotification(activeConfigs: List<TunnelConfig>) {
         val notification =
             when (activeConfigs.size) {
                 0 -> onCreateNotification()
-                1 -> createTunnelNotification(activeConfigs.first())
+                1 -> createTunnelNotification(activeConfigs.first(), consumedTraffic = null)
                 else -> createTunnelsNotification()
             }
+
         ServiceCompat.startForeground(
             this,
             NotificationManager.VPN_NOTIFICATION_ID,
@@ -111,21 +156,43 @@ abstract class BaseTunnelForegroundService : LifecycleService(), TunnelService {
 
     override fun stop() {
         Timber.d("Stop called")
+        statsJob?.cancel()
+        statsJob = null
+        currentSingleTunnelId = null
+
         ServiceCompat.stopForeground(this, ServiceCompat.STOP_FOREGROUND_REMOVE)
         stopSelf()
     }
 
     override fun onDestroy() {
         serviceManager.handleTunnelServiceDestroy()
+
+        statsJob?.cancel()
+        statsJob = null
+        currentSingleTunnelId = null
+
         ServiceCompat.stopForeground(this, ServiceCompat.STOP_FOREGROUND_REMOVE)
         Timber.d("onDestroy")
         super.onDestroy()
     }
 
-    private fun createTunnelNotification(tunnelConfig: TunnelConfig): Notification {
+    private fun createTunnelNotification(
+        tunnelConfig: TunnelConfig,
+        consumedTraffic: Pair<Long, Long>?,
+    ): Notification {
+
+        val subText =
+            consumedTraffic?.let { traffic ->
+                val formattedRx = "↓ ${formatBytes(traffic.first)}"
+                val formattedTx = "↑ ${formatBytes(traffic.second)}"
+                "$formattedRx $formattedTx"
+            }
+
         return notificationManager.createNotification(
             WireGuardNotification.NotificationChannels.VPN,
-            title = "${getString(R.string.tunnel_running)} - ${tunnelConfig.name}",
+            title = tunnelConfig.name,
+            description = getString(R.string.tunnel_running),
+            subText = subText,
             actions =
                 listOf(
                     notificationManager.createNotificationAction(
@@ -160,4 +227,6 @@ abstract class BaseTunnelForegroundService : LifecycleService(), TunnelService {
             isGroupSummary = true,
         )
     }
+
+    private fun formatBytes(bytes: Long) = Formatter.formatFileSize(this, bytes)
 }

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/common/ExpandingRowListItem.kt

@@ -10,14 +10,15 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.text.AnnotatedString
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 
 @OptIn(ExperimentalFoundationApi::class)
 @Composable
 fun ExpandingRowListItem(
     leading: @Composable () -> Unit,
-    text: String,
+    text: AnnotatedString,
     trailing: @Composable () -> Unit,
     isSelected: Boolean,
     expanded: @Composable () -> Unit,

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/navigation/components/currentBackStackEntryAsNavbarState.kt

@@ -218,6 +218,18 @@ fun currentRouteAsNavbarState(
                         topTitle = context.getString(R.string.sort),
                         topTrailing = {
                             Row {
+                                IconButton(
+                                    onClick = {
+                                        sharedViewModel.postSideEffect(
+                                            LocalSideEffect.SortByLatency
+                                        )
+                                    }
+                                ) {
+                                    Icon(
+                                        Icons.Rounded.NetworkCheck,
+                                        stringResource(R.string.sort_by_latency),
+                                    )
+                                }
                                 IconButton(
                                     onClick = {
                                         sharedViewModel.postSideEffect(LocalSideEffect.Sort)