ci: fix notifications

.github/workflows/notifications.yml

@@ -10,64 +10,120 @@ jobs:
   notify:
     runs-on: ubuntu-latest
     steps:
-      - name: Send to Telegram
+      - name: Send to Telegram - New Issue
+        if: github.event_name == 'issues' && github.event.action == 'opened'
+        env:
+          TITLE: ${{ github.event.issue.title }}
+          NUMBER: ${{ github.event.issue.number }}
+          USER: ${{ github.event.issue.user.login }}
+          BODY: ${{ github.event.issue.body || 'No body provided' }}
+          URL: ${{ github.event.issue.html_url }}
         run: |
-          if [[ "${{ github.event_name }}" == "issues" && "${{ github.event.action }}" == "opened" ]]; then
-            TITLE="${{ github.event.issue.title }}"
-            NUMBER=${{ github.event.issue.number }}
-            USER="${{ github.event.issue.user.login }}"
-            BODY="${{ github.event.issue.body || 'No body provided' }}"
-            BODY_TRUNC="${BODY:0:200}"  # Truncate to avoid spam
-            URL="${{ github.event.issue.html_url }}"
-            TEXT=$(echo -e "🆕 New Issue #$NUMBER: *$TITLE* by $USER\n\n$BODY_TRUNC\n\n[View Issue]($URL)")
-          elif [[ "${{ github.event_name }}" == "issues" && "${{ github.event.action }}" == "closed" ]]; then
-            TITLE="${{ github.event.issue.title }}"
-            NUMBER=${{ github.event.issue.number }}
-            USER="${{ github.event.issue.user.login }}"
-            URL="${{ github.event.issue.html_url }}"
-            TEXT=$(echo -e "✅ Issue Closed #$NUMBER: *$TITLE* by $USER\n\n[View Issue]($URL)")
-          elif [[ "${{ github.event_name }}" == "release" && "${{ github.event.action }}" == "published" ]]; then
-            NAME="${{ github.event.release.name }}"
-            TAG="${{ github.event.release.tag_name }}"
-            BODY="${{ github.event.release.body || 'No notes provided' }}"
-            BODY_TRUNC="${BODY:0:200}"  # Truncate to avoid spam
-            URL="${{ github.event.release.html_url }}"
-            TEXT=$(echo -e "🚀 New Release *$NAME* ($TAG)\n\n$BODY_TRUNC\n\n[View Release]($URL)")
-          fi
-
+          BODY_TRUNC="${BODY:0:200}"  # Truncate to avoid spam
+          TEXT=$(echo -e "🆕 New Issue #$NUMBER: *$TITLE* by $USER\n\n$BODY_TRUNC\n\n[View Issue]($URL)")
           curl -s -X POST "https://api.telegram.org/bot${{ secrets.TELEGRAM_TOKEN }}/sendMessage" \
             -d chat_id="${{ vars.TELEGRAM_CHAT_ID }}" \
             ${{ vars.TELEGRAM_THREAD_ID && format('-d message_thread_id="{0}"', vars.TELEGRAM_THREAD_ID) || '' }} \
             -d parse_mode="Markdown" \
             --data-urlencode "text=$TEXT"
 
-      - name: Send to Matrix
+      - name: Send to Telegram - Closed Issue
+        if: github.event_name == 'issues' && github.event.action == 'closed'
+        env:
+          TITLE: ${{ github.event.issue.title }}
+          NUMBER: ${{ github.event.issue.number }}
+          USER: ${{ github.event.issue.user.login }}
+          URL: ${{ github.event.issue.html_url }}
         run: |
-          PLAIN_MESSAGE=""
-          HTML_MESSAGE=""
-          if [[ "${{ github.event_name }}" == "issues" && "${{ github.event.action }}" == "opened" ]]; then
-            PLAIN_MESSAGE=$(echo -e "🆕 New Issue #${{ github.event.issue.number }}: ${{ github.event.issue.title }} by ${{ github.event.issue.user.login }}\n\n${{ github.event.issue.body || 'No body provided' }}\n\nView Issue: ${{ github.event.issue.html_url }}")
-            HTML_MESSAGE=$(echo -e "<p>🆕 New Issue #${{ github.event.issue.number }}: <strong>${{ github.event.issue.title }}</strong> by ${{ github.event.issue.user.login }}</p><p>${{ github.event.issue.body || 'No body provided' }}</p><p><a href=\"${{ github.event.issue.html_url }}\">View Issue</a></p>")
-          elif [[ "${{ github.event_name }}" == "issues" && "${{ github.event.action }}" == "closed" ]]; then
-            PLAIN_MESSAGE=$(echo -e "✅ Issue Closed #${{ github.event.issue.number }}: ${{ github.event.issue.title }} by ${{ github.event.issue.user.login }}\n\nView Issue: ${{ github.event.issue.html_url }}")
-            HTML_MESSAGE=$(echo -e "<p>✅ Issue Closed #${{ github.event.issue.number }}: <strong>${{ github.event.issue.title }}</strong> by ${{ github.event.issue.user.login }}</p><p><a href=\"${{ github.event.issue.html_url }}\">View Issue</a></p>")
-          elif [[ "${{ github.event_name }}" == "release" && "${{ github.event.action }}" == "published" ]]; then
-            PLAIN_MESSAGE=$(echo -e "🚀 New Release ${{ github.event.release.name }} (${{ github.event.release.tag_name }})\n\n${{ github.event.release.body || 'No notes provided' }}\n\nView Release: ${{ github.event.release.html_url }}")
-            HTML_MESSAGE=$(echo -e "<p>🚀 New Release <strong>${{ github.event.release.name }}</strong> (${{ github.event.release.tag_name }})</p><p>${{ github.event.release.body || 'No notes provided' }}</p><p><a href=\"${{ github.event.release.html_url }}\">View Release</a></p>")
-          fi
+          TEXT=$(echo -e "✅ Issue Closed #$NUMBER: *$TITLE* by $USER\n\n[View Issue]($URL)")
+          curl -s -X POST "https://api.telegram.org/bot${{ secrets.TELEGRAM_TOKEN }}/sendMessage" \
+            -d chat_id="${{ vars.TELEGRAM_CHAT_ID }}" \
+            ${{ vars.TELEGRAM_THREAD_ID && format('-d message_thread_id="{0}"', vars.TELEGRAM_THREAD_ID) || '' }} \
+            -d parse_mode="Markdown" \
+            --data-urlencode "text=$TEXT"
 
+      - name: Send to Telegram - New Release
+        if: github.event_name == 'release' && github.event.action == 'published'
+        env:
+          NAME: ${{ github.event.release.name }}
+          TAG: ${{ github.event.release.tag_name }}
+          BODY: ${{ github.event.release.body || 'No notes provided' }}
+          URL: ${{ github.event.release.html_url }}
+        run: |
+          BODY_TRUNC="${BODY:0:200}"  # Truncate to avoid spam
+          TEXT=$(echo -e "🚀 New Release *$NAME* ($TAG)\n\n$BODY_TRUNC\n\n[View Release]($URL)")
+          curl -s -X POST "https://api.telegram.org/bot${{ secrets.TELEGRAM_TOKEN }}/sendMessage" \
+            -d chat_id="${{ vars.TELEGRAM_CHAT_ID }}" \
+            ${{ vars.TELEGRAM_THREAD_ID && format('-d message_thread_id="{0}"', vars.TELEGRAM_THREAD_ID) || '' }} \
+            -d parse_mode="Markdown" \
+            --data-urlencode "text=$TEXT"
+
+      - name: Send to Matrix - New Issue
+        if: github.event_name == 'issues' && github.event.action == 'opened'
+        env:
+          NUMBER: ${{ github.event.issue.number }}
+          TITLE: ${{ github.event.issue.title }}
+          USER: ${{ github.event.issue.user.login }}
+          BODY: ${{ github.event.issue.body || 'No body provided' }}
+          URL: ${{ github.event.issue.html_url }}
+        run: |
+          PLAIN_MESSAGE=$(echo -e "🆕 New Issue #$NUMBER: $TITLE by $USER\n\n$BODY\n\nView Issue: $URL")
+          HTML_MESSAGE=$(echo -e "<p>🆕 New Issue #$NUMBER: <strong>$TITLE</strong> by $USER</p><p>$BODY</p><p><a href=\"$URL\">View Issue</a></p>")
           PLAIN_MESSAGE="${PLAIN_MESSAGE:0:220}"
-
           PAYLOAD=$(jq -n --arg body "$PLAIN_MESSAGE" --arg formatted "$HTML_MESSAGE" '{
             "msgtype": "m.text",
             "body": $body,
             "format": "org.matrix.custom.html",
             "formatted_body": $formatted
           }')
-
           TXN_ID="${{ github.run_id }}-${{ github.run_attempt }}"
-
           curl -s -X PUT "https://${{ vars.MATRIX_HOMESERVER }}/_matrix/client/v3/rooms/${{ vars.MATRIX_ROOM_ID }}/send/m.room.message/$TXN_ID" \
             -H "Authorization: Bearer ${{ secrets.MATRIX_ACCESS_TOKEN }}" \
             -H "Content-Type: application/json" \
             -d "$PAYLOAD"
+
+      - name: Send to Matrix - Closed Issue
+        if: github.event_name == 'issues' && github.event.action == 'closed'
+        env:
+          NUMBER: ${{ github.event.issue.number }}
+          TITLE: ${{ github.event.issue.title }}
+          USER: ${{ github.event.issue.user.login }}
+          URL: ${{ github.event.issue.html_url }}
+        run: |
+          PLAIN_MESSAGE=$(echo -e "✅ Issue Closed #$NUMBER: $TITLE by $USER\n\nView Issue: $URL")
+          HTML_MESSAGE=$(echo -e "<p>✅ Issue Closed #$NUMBER: <strong>$TITLE</strong> by $USER</p><p><a href=\"$URL\">View Issue</a></p>")
+          PLAIN_MESSAGE="${PLAIN_MESSAGE:0:220}"
+          PAYLOAD=$(jq -n --arg body "$PLAIN_MESSAGE" --arg formatted "$HTML_MESSAGE" '{
+            "msgtype": "m.text",
+            "body": $body,
+            "format": "org.matrix.custom.html",
+            "formatted_body": $formatted
+          }')
+          TXN_ID="${{ github.run_id }}-${{ github.run_attempt }}"
+          curl -s -X PUT "https://${{ vars.MATRIX_HOMESERVER }}/_matrix/client/v3/rooms/${{ vars.MATRIX_ROOM_ID }}/send/m.room.message/$TXN_ID" \
+            -H "Authorization: Bearer ${{ secrets.MATRIX_ACCESS_TOKEN }}" \
+            -H "Content-Type: application/json" \
+            -d "$PAYLOAD"
+
+      - name: Send to Matrix - New Release
+        if: github.event_name == 'release' && github.event.action == 'published'
+        env:
+          NAME: ${{ github.event.release.name }}
+          TAG: ${{ github.event.release.tag_name }}
+          BODY: ${{ github.event.release.body || 'No notes provided' }}
+          URL: ${{ github.event.release.html_url }}
+        run: |
+          PLAIN_MESSAGE=$(echo -e "🚀 New Release $NAME ($TAG)\n\n$BODY\n\nView Release: $URL")
+          HTML_MESSAGE=$(echo -e "<p>🚀 New Release <strong>$NAME</strong> ($TAG)</p><p>$BODY</p><p><a href=\"$URL\">View Release</a></p>")
+          PLAIN_MESSAGE="${PLAIN_MESSAGE:0:220}"
+          PAYLOAD=$(jq -n --arg body "$PLAIN_MESSAGE" --arg formatted "$HTML_MESSAGE" '{
+            "msgtype": "m.text",
+            "body": $body,
+            "format": "org.matrix.custom.html",
+            "formatted_body": $formatted
+          }')
+          TXN_ID="${{ github.run_id }}-${{ github.run_attempt }}"
+          curl -s -X PUT "https://${{ vars.MATRIX_HOMESERVER }}/_matrix/client/v3/rooms/${{ vars.MATRIX_ROOM_ID }}/send/m.room.message/$TXN_ID" \
+            -H "Authorization: Bearer ${{ secrets.MATRIX_ACCESS_TOKEN }}" \
+            -H "Content-Type: application/json" \
+            -d "$PAYLOAD"

app/src/main/java/com/zaneschepke/wireguardautotunnel/core/tunnel/TunnelManager.kt

@@ -325,6 +325,18 @@ constructor(
             proxyUserspaceTunnel.setBackendMode(BackendMode.Inactive)
     }
 
+    private fun isVpnAuthorized(
+        mode: AppMode,
+        hasVpnPermission: () -> Boolean = { serviceManager.hasVpnPermission() },
+    ): Boolean {
+        return when (mode) {
+            AppMode.VPN,
+            AppMode.LOCK_DOWN -> hasVpnPermission()
+            AppMode.KERNEL,
+            AppMode.PROXY -> true
+        }
+    }
+
     suspend fun handleRestore() =
         withContext(ioDispatcher) {
             val settings = settingsRepository.getGeneralSettings()
@@ -332,18 +344,20 @@ constructor(
             val tunnels = tunnelsRepository.getAll()
             if (autoTunnelSettings.isAutoTunnelEnabled)
                 return@withContext restoreAutoTunnel(autoTunnelSettings)
-            when (val mode = settings.appMode) {
-                AppMode.VPN,
-                AppMode.PROXY,
-                AppMode.LOCK_DOWN -> {
-                    if (serviceManager.hasVpnPermission()) {
+            if (isVpnAuthorized(settings.appMode)) {
+                when (val mode = settings.appMode) {
+                    AppMode.VPN,
+                    AppMode.PROXY,
+                    AppMode.LOCK_DOWN -> {
                         if (mode == AppMode.LOCK_DOWN)
                             handleLockDownModeInit(settings.isLanOnKillSwitchEnabled)
                         tunnels.firstOrNull { it.isActive }?.let { startTunnel(it) }
-                    } else localErrorEvents.emit(null to BackendCoreException.NotAuthorized)
+                    }
+                    AppMode.KERNEL ->
+                        tunnels.filter { it.isActive }.forEach { conf -> startTunnel(conf) }
                 }
-                AppMode.KERNEL ->
-                    tunnels.filter { it.isActive }.forEach { conf -> startTunnel(conf) }
+            } else {
+                localErrorEvents.emit(null to BackendCoreException.NotAuthorized)
             }
         }
 
@@ -361,21 +375,18 @@ constructor(
                 return@withContext restoreAutoTunnel(autoTunnelSettings)
             if (settings.isRestoreOnBootEnabled) {
                 tunnelsRepository.resetActiveTunnels()
-                when (val mode = settings.appMode) {
-                    AppMode.VPN,
-                    AppMode.PROXY,
-                    AppMode.LOCK_DOWN -> {
-                        if (serviceManager.hasVpnPermission()) {
-                            if (mode == AppMode.LOCK_DOWN)
-                                handleLockDownModeInit(settings.isLanOnKillSwitchEnabled)
-                        } else
-                            return@withContext localErrorEvents.emit(
-                                null to BackendCoreException.NotAuthorized
-                            )
+                if (isVpnAuthorized(settings.appMode)) {
+                    when (val mode = settings.appMode) {
+                        AppMode.LOCK_DOWN ->
+                            handleLockDownModeInit(settings.isLanOnKillSwitchEnabled)
+                        AppMode.KERNEL,
+                        AppMode.VPN,
+                        AppMode.PROXY -> Unit
                     }
-                    AppMode.KERNEL -> Unit
+                    defaultTunnel?.let { startTunnel(it) }
+                } else {
+                    localErrorEvents.emit(null to BackendCoreException.NotAuthorized)
                 }
-                defaultTunnel?.let { startTunnel(it) }
             }
         }
 

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/tunnels/components/TunnelStatisticsRow.kt

@@ -35,14 +35,15 @@ fun TunnelStatisticsRow(
     val textColor = MaterialTheme.colorScheme.outline
 
     // needs to be set as peer stats for duplicates return as a single set of stats
-    val peers by remember(tunnel) {
-        derivedStateOf {
-            TunnelConfig.configFromWgQuick(tunnel.wgQuick)
-                .peers
-                .map { it.publicKey.toBase64() }
-                .toSet()
+    val peers by
+        remember(tunnel) {
+            derivedStateOf {
+                TunnelConfig.configFromWgQuick(tunnel.wgQuick)
+                    .peers
+                    .map { it.publicKey.toBase64() }
+                    .toSet()
+            }
         }
-    }
 
     var currentTimeMillis by remember { mutableLongStateOf(System.currentTimeMillis()) }
     LaunchedEffect(Unit) {