sync upstream

.github/workflows/android-build.yml

@@ -1,6 +1,7 @@
 name: Android CI
 
 on:
+  workflow_dispatch:
   push:
     branches: [ "main", "develop" ]
   pull_request:

.github/workflows/release.yml

@@ -38,17 +38,20 @@ jobs:
       - name: Grant execute permission for Gradlew
         run: chmod +x ./gradlew
 
-      - name: Build Release APK (with Tor)
+      - name: Build Release APKs (with architecture splits)
         run: ./gradlew assembleRelease --no-daemon --stacktrace
 
       - name: List APK files
         run: |
           echo "APK files built:"
-          find app/build/outputs/apk -name "*.apk" -type f
+          find app/build/outputs/apk/release -name "*.apk" -type f -exec ls -lh {} \;
 
-      - name: Rename APK
+      - name: Rename APKs for GitHub Release
         run: |
-          mv app/build/outputs/apk/release/app-release-unsigned.apk app/build/outputs/apk/release/bitchat-android.apk
+          cd app/build/outputs/apk/release
+          [ -f "app-arm64-v8a-release-unsigned.apk" ] && mv app-arm64-v8a-release-unsigned.apk bitchat-android-arm64.apk
+          [ -f "app-x86_64-release-unsigned.apk" ] && mv app-x86_64-release-unsigned.apk bitchat-android-x86_64.apk
+          [ -f "app-universal-release-unsigned.apk" ] && mv app-universal-release-unsigned.apk bitchat-android-universal.apk
 
       - name: DEBUG
         run: |
@@ -59,8 +62,8 @@ jobs:
           ls -all
           tree || ls -R
 
-      # Optional: Sign APK (requires secrets)
-      # - name: Sign APK
+      # Optional: Sign APKs (uncomment and configure secrets when ready)
+      # - name: Sign APKs
       #   uses: r0adkll/sign-android-release@v1
       #   with:
       #     releaseDirectory: app/build/outputs/apk/release
@@ -69,10 +72,10 @@ jobs:
       #     keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }}
       #     keyPassword: ${{ secrets.KEY_PASSWORD }}
 
-      - name: Upload APK as artifact
+      - name: Upload APKs as artifacts
         uses: actions/upload-artifact@v4
         with:
-          name: bitchat-android-apk-${{ github.ref_name }}
+          name: bitchat-android-release-${{ github.ref_name }}
           path: app/build/outputs/apk/release/*.apk
           retention-days: 30
           if-no-files-found: error
@@ -82,25 +85,23 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - name: Download APK artifact
+      - name: Download release artifacts
         uses: actions/download-artifact@v4
         with:
-          name: bitchat-android-apk-${{ github.ref_name }}
+          name: bitchat-android-release-${{ github.ref_name }}
           path: release
 
       - name: Create GitHub Release
         uses: softprops/action-gh-release@v2
         with:
           files: |
-            release/bitchat-android.apk
+            release/bitchat-android-arm64.apk
+            release/bitchat-android-x86_64.apk
+            release/bitchat-android-universal.apk
           name: Release ${{ github.ref_name }}
           body: |
-            ## bitchat Android Release
-
-            **bitchat-android.apk** (~15MB)
-            - Secure P2P messaging over Bluetooth mesh and Nostr
-            - Built-in Tor support (custom Arti build with 16KB page size)
-            - Compatible with Google Play requirements (Nov 2025+)
-            - Cross-platform compatible with iOS version
+            **bitchat-android-arm64.apk** - ARM64 (most phones)
+            **bitchat-android-x86_64.apk** - x86_64 (Chromebooks, tablets)
+            **bitchat-android-universal.apk** - All architectures (fallback)
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

AGENTS.md

@@ -0,0 +1,74 @@
+# Bitchat Android - Agent Guide
+
+This document provides context, architectural insights, and development standards for AI agents working on the Bitchat Android codebase.
+
+## 1. Project Overview
+**Bitchat** is a decentralized, off-grid communication application focused on privacy and censorship resistance. It utilizes mesh networking (primarily Bluetooth LE and Tor/Arti) to enable peer-to-peer messaging without centralized servers.
+
+**Key Technologies:**
+- **Language:** Kotlin (JVM Target 1.8)
+- **UI Framework:** Jetpack Compose (Material 3)
+- **Asynchronous:** Kotlin Coroutines & Flow
+- **Networking:** Bluetooth Low Energy (BLE), Tor (Arti Rust bridge), OkHttp
+- **Architecture:** MVVM with Clean Architecture principles
+- **Build System:** Gradle (Kotlin DSL)
+
+## 2. Architecture & Directory Structure
+The application follows a clean architecture pattern, heavily modularized by feature within the `app` module.
+
+**Root Package:** `com.bitchat.android`
+
+| Directory | Purpose |
+|-----------|---------|
+| `ui/` | **Presentation Layer**: Jetpack Compose screens, themes, and ViewModels. |
+| `service/` | **Core Service**: Contains `MeshForegroundService`, managing persistent background connectivity. |
+| `mesh/` | **Mesh Networking**: Logic for peer discovery, advertising, and message routing. |
+| `protocol/` | **Wire Protocol**: Definitions of messages exchanged between peers. |
+| `crypto/` | **Security**: Cryptographic primitives and key management. |
+| `noise/` | **Encryption**: Implementation of the Noise Protocol Framework for secure channels. |
+| `identity/` | **User Identity**: Management of user profiles and public/private keys. |
+| `features/` | **App Features**: Sub-modules for `voice`, `file`, and `media` handling. |
+| `nostr/` | **Relay Integration**: Logic for Nostr protocol integration and relay management. |
+| `geohash/` | **Location**: Utilities for location-based features and geohashing. |
+| `net/` | **Networking**: General network utilities and abstractions. |
+
+## 3. Key Components
+
+### UI Layer (Jetpack Compose)
+- **Activity**: Single-Activity architecture (`MainActivity.kt`).
+- **Navigation**: Jetpack Compose Navigation.
+- **State Management**: `ViewModel` exposing `StateFlow` to Composables.
+- **Theme**: Custom theme definitions in `ui/theme`.
+
+### Networking & Connectivity
+- **MeshForegroundService**: The critical component that keeps the mesh network alive. It manages the lifecycle of BLE scanning/advertising and other transport layers.
+- **BLE Stack**: Located in `mesh/` and `net/`, handles the intricacies of Android Bluetooth interactions.
+- **Tor/Arti**: Integrated via JNI (`jniLibs`) to provide anonymous internet routing where available.
+
+## 4. Development Standards
+
+### Code Style
+- **Kotlin**: Adhere to official Kotlin coding conventions.
+- **Compose**: Use functional components. Hoist state to ViewModels where possible.
+- **Coroutines**: Use `suspend` functions for all I/O operations. strictly avoid blocking the main thread.
+- **Naming**: Clear, descriptive names. Follow standard Android naming patterns (e.g., `*ViewModel`, `*Repository`, `*Screen`).
+
+### Testing
+- **Unit Tests**: Located in `app/src/test/`. Use for business logic, protocols, and utility testing.
+- **Instrumented Tests**: Located in `app/src/androidTest/`. Use for UI and permission integration testing.
+- **Execution**:
+  - Unit: `./gradlew test`
+  - Instrumented: `./gradlew connectedAndroidTest`
+
+## 5. Critical Constraints & Gotchas
+1.  **Permissions**: The app relies heavily on dangerous runtime permissions (Location, Bluetooth Scan/Connect/Advertise, Audio Recording). Always verify permission handling patterns in `MainActivity` or permission wrappers before adding new hardware features.
+2.  **Hardware Dependency**: Features like BLE are difficult to emulate. When writing code for these, focus on robust error handling and defensive programming as hardware behavior can be flaky.
+3.  **Background Limits**: Android enforces strict background execution limits. Network operations intended to persist must be tied to the `MeshForegroundService`.
+
+## 6. Common Tasks
+- **Build Debug APK**: `./gradlew assembleDebug`
+- **Lint Check**: `./gradlew lint`
+- **Clean Build**: `./gradlew clean`
+
+---
+*Note: This file is intended to assist AI agents in navigating and modifying the codebase efficiently. Always verify context by reading the actual files before making changes.*