Merge branch 'feat/custom-webhook-api' into 'master'

Author: ItsAzni

.github/workflows/build.yml

@@ -0,0 +1,98 @@
+name: Build & Release APK
+
+on:
+  push:
+    tags:
+      - 'v*.*.*'
+    branches:
+      - '**'
+  pull_request:
+    branches:
+      - '**'
+  workflow_dispatch:
+
+jobs:
+  build:
+    name: Build Signed Release APK
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
+        with:
+          java-version: '17'
+          distribution: 'temurin'
+          cache: gradle
+
+      - name: Setup Android SDK
+        uses: android-actions/setup-android@v3
+
+      - name: Grant execute permission for gradlew
+        run: chmod +x gradlew
+
+      - name: Clean build
+        run: ./gradlew clean
+
+      - name: Decode Keystore
+        run: |
+          echo "${{ secrets.KEYSTORE_BASE64 }}" | base64 --decode > ${{ github.workspace }}/notif-forwarder-release.jks
+
+      - name: Build Release APK
+        run: |
+          ./gradlew assembleRelease \
+            -Pandroid.injected.signing.store.file=${{ github.workspace }}/notif-forwarder-release.jks \
+            -Pandroid.injected.signing.store.password=${{ secrets.KEYSTORE_PASSWORD }} \
+            -Pandroid.injected.signing.key.alias=${{ secrets.KEY_ALIAS }} \
+            -Pandroid.injected.signing.key.password=${{ secrets.KEY_PASSWORD }}
+
+      - name: Cleanup Keystore
+        if: always()
+        run: rm -f ${{ github.workspace }}/notif-forwarder-release.jks
+
+      - name: Rename APK
+        run: |
+          if [[ "${{ github.ref }}" == refs/tags/* ]]; then
+            VERSION="${{ github.ref_name }}"
+          else
+            BRANCH=$(echo "${{ github.ref_name }}" | sed 's/[^a-zA-Z0-9._-]/-/g')
+            SHA=$(echo "${{ github.sha }}" | cut -c1-7)
+            VERSION="${BRANCH}-${SHA}"
+          fi
+
+          APK_SRC="app/build/outputs/apk/release/app-release.apk"
+          APK_DEST="NotificationForwarder-${VERSION}.apk"
+
+          cp "$APK_SRC" "$APK_DEST"
+          echo "APK_PATH=$APK_DEST" >> $GITHUB_ENV
+          echo "VERSION=$VERSION" >> $GITHUB_ENV
+
+      - name: Upload APK as Artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: NotificationForwarder-${{ env.VERSION }}
+          path: ${{ env.APK_PATH }}
+          retention-days: 30
+
+      - name: Create GitHub Release
+        if: startsWith(github.ref, 'refs/tags/')
+        uses: softprops/action-gh-release@v2
+        with:
+          name: NotificationForwarder ${{ env.VERSION }}
+          body: |
+            ## NotificationForwarder ${{ env.VERSION }}
+
+            ### Download
+            Download the APK below and install it on your Android device.
+
+            > **Minimum Android:** 8.0 (API 26)
+          files: ${{ env.APK_PATH }}
+          draft: false
+          prerelease: false
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+permissions:
+  contents: write

README.md

@@ -5,7 +5,8 @@ Android app to listen for incoming notifications and forward them to a configura
 ## Features
 
 - Notification capture using `NotificationListenerService`
-- Webhook forwarding with configurable URL, auth mode, and custom headers
+- Webhook forwarding with configurable URL, HTTP method, auth mode, custom headers, query params, and payload template
+- Compatible with Telegram Bot API, Discord webhooks, and any custom API
 - Queue system with Room (durable local storage)
 - Retry system with WorkManager (network constraints + backoff)
 - Background support
@@ -24,6 +25,63 @@ Android app to listen for incoming notifications and forward them to a configura
 ./gradlew assembleDebug
 ```
 
+## Webhook Configuration
+
+### Supported HTTP Methods
+- `GET` — no request body, query params appended to URL
+- `POST` — with JSON body
+- `PUT` — with JSON body
+- `PATCH` — with JSON body
+
+### Authentication
+- **None** — no auth header
+- **Bearer** — adds `Authorization: Bearer <token>`
+- **Custom** — define any headers manually
+
+### Custom Query Params
+Add per line as `key=value`:
+```
+chat_id=123456789
+token=abc123
+```
+
+### Custom Payload Template
+Use JSON with variable placeholders. Leave blank for default payload.
+
+Available variables:
+- `{deviceId}`
+- `{packageName}`
+- `{appName}`
+- `{title}`
+- `{text}`
+- `{postedAt}`
+- `{notificationKey}`
+
+#### Example: Telegram Bot API
+- URL: `https://api.telegram.org/bot<token>/sendMessage`
+- Method: `POST`
+- Payload template:
+```json
+{"chat_id":"123456789","text":"*{appName}*\n*{title}*\n{text}","parse_mode":"Markdown"}
+```
+
+#### Example: Discord Webhook
+- URL: `https://discord.com/api/webhooks/.../...`
+- Method: `POST`
+- Payload template:
+```json
+{"content":"**{appName}**\n**{title}**\n{text}"}
+```
+
+#### Example: Custom GET API
+- URL: `https://example.com/api/alert`
+- Method: `GET`
+- Query params:
+```
+device={deviceId}
+msg={title}
+```
+
 ## Local Webhook API (`webhook/`)
 
 This repository includes a Node.js webhook receiver in `webhook/` for local testing.
@@ -52,12 +110,14 @@ Health check:
 
 Environment config (`webhook/.env`):
 
-- `HOST`
-- `PORT`
-- `WEBHOOK_PATH`
-- `WEBHOOK_BEARER_TOKEN`
-- `WEBHOOK_LOG_FILE`
-- `JSON_LIMIT`
+| Key | Description |
+|-----|-------------|
+| `HOST` | Server host |
+| `PORT` | Server port |
+| `WEBHOOK_PATH` | Webhook endpoint path |
+| `WEBHOOK_BEARER_TOKEN` | Optional bearer token |
+| `WEBHOOK_LOG_FILE` | Log file path |
+| `JSON_LIMIT` | Max JSON body size |
 
 ## Screenshots
 

app/build.gradle.kts

@@ -13,7 +13,7 @@ android {
         minSdk = 26
         targetSdk = 36
         versionCode = 1
-        versionName = "1.0"
+        versionName = "1.1.0"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }

app/src/main/java/com/itsazni/notificationforwarder/MainActivity.kt

@@ -83,25 +83,31 @@ private enum class AppTab(val label: String, val icon: ImageVector) {
 
 private data class UiSettings(
     val webhookUrl: String,
+    val webhookMethod: String,
     val forwardingEnabled: Boolean,
     val filterMode: FilterMode,
     val filterPackagesRaw: String,
     val authMode: AuthMode,
     val bearerToken: String,
     val customHeadersRaw: String,
+    val queryParamsRaw: String,
+    val payloadTemplateRaw: String,
     val maxRetriesRaw: String,
     val batchSizeRaw: String
 )
 
 private fun AppSettings.toUiSettings(): UiSettings {
     return UiSettings(
         webhookUrl = webhookUrl,
+        webhookMethod = webhookMethod,
         forwardingEnabled = forwardingEnabled,
         filterMode = filterMode,
         filterPackagesRaw = filterPackages.joinToString("\n"),
         authMode = authMode,
         bearerToken = bearerToken,
         customHeadersRaw = customHeadersRaw,
+        queryParamsRaw = queryParamsRaw,
+        payloadTemplateRaw = payloadTemplateRaw,
         maxRetriesRaw = maxRetries.toString(),
         batchSizeRaw = batchSize.toString()
     )
@@ -179,12 +185,14 @@ private fun MainScreen(settingsStore: SettingsStore) {
                         val result = withContext(Dispatchers.IO) {
                             WebhookClient().send(
                                 url = uiSettings.webhookUrl,
-                                method = "POST",
+                                method = uiSettings.webhookMethod,
                                 headers = buildHeadersPreview(
                                     authMode = uiSettings.authMode,
                                     token = uiSettings.bearerToken,
                                     customHeadersRaw = uiSettings.customHeadersRaw
                                 ),
+                                queryParams = parseKeyValuePairs(uiSettings.queryParamsRaw),
+                                payloadTemplate = uiSettings.payloadTemplateRaw,
                                 item = QueueItem(
                                     packageName = "com.test.package",
                                     appName = "Webhook Test",
@@ -383,6 +391,15 @@ private fun WebhookScreen(
                         singleLine = true
                     )
 
+                    DropdownSelector(
+                        label = "HTTP method",
+                        value = uiSettings.webhookMethod,
+                        options = listOf("GET", "POST", "PUT", "PATCH"),
+                        onSelected = {
+                            onSettingsChange(uiSettings.copy(webhookMethod = it))
+                        }
+                    )
+
                     DropdownSelector(
                         label = "Auth mode",
                         value = uiSettings.authMode.name,
@@ -410,6 +427,24 @@ private fun WebhookScreen(
                         label = { Text("Custom headers (Key: Value per line)") }
                     )
 
+                    OutlinedTextField(
+                        modifier = Modifier
+                            .fillMaxWidth()
+                            .height(140.dp),
+                        value = uiSettings.queryParamsRaw,
+                        onValueChange = { onSettingsChange(uiSettings.copy(queryParamsRaw = it)) },
+                        label = { Text("Query params (key=value per line)") }
+                    )
+
+                    OutlinedTextField(
+                        modifier = Modifier
+                            .fillMaxWidth()
+                            .height(200.dp),
+                        value = uiSettings.payloadTemplateRaw,
+                        onValueChange = { onSettingsChange(uiSettings.copy(payloadTemplateRaw = it)) },
+                        label = { Text("Payload template (JSON with {title} {text} etc.)") }
+                    )
+
                     Button(modifier = Modifier.fillMaxWidth(), onClick = onSave) {
                         Text("Save Webhook Settings")
                     }
@@ -639,12 +674,15 @@ private fun QueueStatCard(
 
 private fun saveSettings(settingsStore: SettingsStore, uiSettings: UiSettings) {
     settingsStore.webhookUrl = uiSettings.webhookUrl
+    settingsStore.webhookMethod = uiSettings.webhookMethod
     settingsStore.forwardingEnabled = uiSettings.forwardingEnabled
     settingsStore.filterMode = uiSettings.filterMode
     settingsStore.filterPackages = SettingsStore.parsePackages(uiSettings.filterPackagesRaw)
     settingsStore.authMode = uiSettings.authMode
     settingsStore.bearerToken = uiSettings.bearerToken
     settingsStore.customHeadersRaw = uiSettings.customHeadersRaw
+    settingsStore.queryParamsRaw = uiSettings.queryParamsRaw
+    settingsStore.payloadTemplateRaw = uiSettings.payloadTemplateRaw
     settingsStore.maxRetries = uiSettings.maxRetriesRaw.toIntOrNull() ?: 10
     settingsStore.batchSize = uiSettings.batchSizeRaw.toIntOrNull() ?: 20
 }
@@ -658,6 +696,21 @@ private fun isNotificationListenerEnabled(context: Context): Boolean {
     return enabled.contains(target.flattenToString())
 }
 
+private fun parseKeyValuePairs(raw: String): Map<String, String> {
+    val map = linkedMapOf<String, String>()
+    raw.lines().forEach { line ->
+        val trimmed = line.trim()
+        if (trimmed.isEmpty()) return@forEach
+        val idx = trimmed.indexOf('=')
+        if (idx > 0) {
+            val key = trimmed.substring(0, idx).trim()
+            val value = trimmed.substring(idx + 1).trim()
+            if (key.isNotEmpty()) map[key] = value
+        }
+    }
+    return map
+}
+
 private fun buildHeadersPreview(
     authMode: AuthMode,
     token: String,