change-default-sim (#60)

Co-authored-by: AlexisDanlos <91090088+AlexisDanlos@users.noreply.github.com>
Co-authored-by: stcb <21@stcb.cc>
Reviewed-on: #60
Co-authored-by: AlexisDanlos <alexis.danlos@epitech.eu>
Co-committed-by: AlexisDanlos <alexis.danlos@epitech.eu>

.gitignore

@@ -9,6 +9,7 @@
 .history
 .svn/
 migrate_working_dir/
+protocol_prototype/venv
 
 # IntelliJ related
 *.iml

README.md

@@ -1,21 +1,72 @@
-# Icing
+---
+gitea: none
+include_toc: true
+---
 
-## Encrypting phone calls on an analog audio level
+# Icing – end-to-end-encrypted phone calls without data
+
+
+Experimental α-stage • Apache-2.0 • Built at Epitech
+
+ 
+
+> **Icing** runs a Noise-XK handshake, Codec2 and 4-FSK modulation over the plain voice channel, so any GSM/VoLTE call can be upgraded to private, authenticated audio - **no servers and no IP stack required.**
 
-An Epitech Innovation Project
 
-*By*
-**Bartosz Michalak - Alexis Danlos - Florian Griffon - Ange Duhayon - Stéphane Corbière**
 
 ---
 
-The **docs** folder contains documentation about:
 
-#### Epitech
-- The Beta Test Plan
-- The Delivrables
 
-#### Icing
-- The project
-- A user manual
-- Our automations
+## 📖 Detailed design
+
+See [`docs/Icing.md`](docs/Icing.md) for protocol goals, threat model, and technical architecture.
+
+## 🔨 Quick start (developer preview, un-protocoled dialer)
+
+```bash
+# on an Android phone (Android 12+)
+git clone https://git.gmoker.com/icing/monorepo
+cd dialer
+# Requires Flutter and ADB or a virtual device
+flutter run
+```
+
+> ⚠️ This is an **alpha prototype**: expect crashes, missing UX, and incomplete FEC.
+
+You can join us in Telegram or Reddit !
+https://t.me/icingdialer
+https://www.reddit.com/r/IcingDialer/
+
+## ✨ Features (α1 snapshot)
+
+- [DryBox Only] Noise *XK* handshake (X25519, AES-GCM, SHA-256)
+- Static keys = Ed25519 (QR share)
+- [DryBox Only] Voice path: Codec2 → encrypted bit-stream → 4-FSK → analog channel
+- GSM simulation in DryBox for off-device testing
+
+## 🗺️ Project status
+
+| Stage (roadmap)       | Dialer app                 | Protocol           | DryBox            | Docs              |
+| --------------------- | -------------------------- | ------------------ | ----------------- | ----------------- |
+| **Alpha 1 (Q3-2025)** | 🚧 UI stub, call hook      | Key gestion | ⚠️ Qt demo, Alpha 1 Working | 📝 Draft complete |
+| Alpha 2 (Q4-2025)     | 🛠️ Magisk flow | 🔄 Adaptive FEC    | 🔄 Stress tests   | 🔄 Expanded       |
+| **Beta 1 (Feb 2026)** | 🎉 Public release          | 🔐 Audit pass      | ✅ CI              | ✅                 |
+
+## 🤝 How to help
+
+
+- **Crypto researchers** – Poke holes in the protocol draft.
+- **Android security hackers** - Review our Kotlin integrations.
+- **ROM maintainers** - Let's talk about an integration !
+
+Open an issue or report here [![Give Feedback](https://img.shields.io/badge/Feedback-Form-blue)](https://cryptpad.fr/form/#/2/form/view/Tgm5vQ7aRgR6TKxy8LMJcJ-nu9CVC32IbqYOyOG4iUs/)
+
+
+## License
+
+Apache License 2.0 - see [`LICENSE`](LICENSE).
+
+---
+
+Made with ☕ by four Epitech students.

dialer/android/.gitignore

@@ -7,6 +7,7 @@ gradle-wrapper.jar
 /gradle.properties
 GeneratedPluginRegistrant.java
 gradle.properties
+.cxx
 
 # Remember to never publicly share your keystore.
 # See https://flutter.dev/to/reference-keystore

dialer/android/app/build.gradle

@@ -24,7 +24,7 @@ android {
         applicationId = "com.icing.dialer"
         // You can update the following values to match your application needs.
         // For more information, see: https://flutter.dev/to/review-gradle-config.
-        minSdk = flutter.minSdkVersion
+        minSdk = 23
         targetSdk = flutter.targetSdkVersion
         versionCode = flutter.versionCode
         versionName = flutter.versionName

dialer/android/app/src/main/AndroidManifest.xml

@@ -1,4 +1,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.icing.dialer">
+    <uses-feature android:name="android.hardware.telephony" android:required="true" />
+
     <uses-permission android:name="android.permission.READ_CONTACTS"/>
     <uses-permission android:name="android.permission.WRITE_CONTACTS"/>
     <uses-permission android:name="android.permission.CALL_PHONE" />
@@ -7,7 +9,11 @@
     <uses-permission android:name="android.permission.WRITE_BLOCKED_NUMBERS" />
     <uses-permission android:name="android.permission.READ_CALL_LOG"/>
     <uses-permission android:name="android.permission.READ_PHONE_STATE"/>
-
+    <uses-permission android:name="android.permission.MANAGE_OWN_CALLS" />
+    <uses-permission android:name="android.permission.ANSWER_PHONE_CALLS" />
+    <uses-permission android:name="android.permission.PROCESS_OUTGOING_CALLS" />
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
+    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
 
     <application
         android:label="Icing Dialer"
@@ -35,7 +41,48 @@
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
+            <!-- Dialer intent filters (required for default dialer eligibility) -->
+            <intent-filter>
+                <action android:name="android.intent.action.DIAL" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.DIAL" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:scheme="tel" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.CALL" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data android:scheme="tel" />
+            </intent-filter>
         </activity>
+        <service
+            android:name=".services.MyInCallService"
+            android:permission="android.permission.BIND_INCALL_SERVICE"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="android.telecom.InCallService" />
+            </intent-filter>
+            <meta-data
+                android:name="android.telecom.IN_CALL_SERVICE_UI"
+                android:value="true" />
+        </service>
+        <!-- Custom ConnextionService, will be needed at some point when we implement our own protocol -->
+        <!-- <service
+            android:name=".services.CallConnectionService"
+            android:permission="android.permission.BIND_TELECOM_CONNECTION_SERVICE"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="android.telecom.ConnectionService" />
+            </intent-filter>
+        </service> -->
+        
         <!-- Don't delete the meta-data below.
              This is used by the Flutter tool to generate GeneratedPluginRegistrant.java -->
         <meta-data

dialer/android/app/src/main/java/com/example/dialer/MainActivity.java

@@ -0,0 +1,49 @@
+package com.example.dialer;
+
+import android.os.Bundle;
+import android.net.Uri;
+import android.content.Context;
+import io.flutter.embedding.android.FlutterActivity;
+import io.flutter.embedding.engine.FlutterEngine;
+import io.flutter.plugin.common.MethodChannel;
+import io.flutter.plugin.common.MethodChannel.MethodCallHandler;
+import io.flutter.plugin.common.MethodChannel.Result;
+import io.flutter.plugin.common.MethodCall;
+import android.telecom.TelecomManager;
+import android.telecom.PhoneAccountHandle;
+import java.util.List;
+import java.util.Collections;
+
+public class MainActivity extends FlutterActivity {
+    private static final String CHANNEL = "call_service";
+
+    @Override
+    public void configureFlutterEngine(FlutterEngine flutterEngine) {
+        super.configureFlutterEngine(flutterEngine);
+        new MethodChannel(flutterEngine.getDartExecutor().getBinaryMessenger(), CHANNEL)
+            .setMethodCallHandler(
+                new MethodCallHandler() {
+                    @Override
+                    public void onMethodCall(MethodCall call, Result result) {
+                        if (call.method.equals("makeGsmCall")) {
+                            String phoneNumber = call.argument("phoneNumber");
+                            int simSlot = call.argument("simSlot");
+                            TelecomManager telecomManager = (TelecomManager) getSystemService(Context.TELECOM_SERVICE);
+                            List<PhoneAccountHandle> accounts = telecomManager.getCallCapablePhoneAccounts();
+                            PhoneAccountHandle selectedAccount = accounts.get(simSlot < accounts.size() ? simSlot : 0);
+                            Bundle extras = new Bundle();
+                            extras.putParcelable(TelecomManager.EXTRA_PHONE_ACCOUNT_HANDLE, selectedAccount);
+                            Uri uri = Uri.fromParts("tel", phoneNumber, null);
+                            telecomManager.placeCall(uri, extras);
+                            result.success(Collections.singletonMap("status", "calling"));
+                        } else if (call.method.equals("hangUpCall")) {
+                            // TODO: implement hangUpCall if needed
+                            result.success(Collections.singletonMap("status", "ended"));
+                        } else {
+                            result.notImplemented();
+                        }
+                    }
+                }
+            );
+    }
+}

dialer/android/app/src/main/kotlin/com/icing/dialer/KeyDeleter.kt

@@ -1,28 +0,0 @@
-package com.icing.dialer
-
-import java.security.KeyStore
-
-object KeyDeleterHelper {
-
-    private const val ANDROID_KEYSTORE = "AndroidKeyStore"
-
-    /**
-     * Deletes the key pair associated with the given alias from the Android Keystore.
-     *
-     * @param alias The alias of the key pair to delete.
-     * @throws Exception if deletion fails.
-     */
-    fun deleteKeyPair(alias: String) {
-        try {
-            val keyStore = KeyStore.getInstance(ANDROID_KEYSTORE).apply { load(null) }
-
-            if (!keyStore.containsAlias(alias)) {
-                throw Exception("No key found with alias \"$alias\" to delete.")
-            }
-
-            keyStore.deleteEntry(alias)
-        } catch (e: Exception) {
-            throw Exception("Failed to delete key pair: ${e.message}", e)
-        }
-    }
-}

dialer/android/app/src/main/kotlin/com/icing/dialer/KeyGenerator.kt

@@ -1,47 +0,0 @@
-package com.icing.dialer
-
-import android.security.keystore.KeyGenParameterSpec
-import android.security.keystore.KeyProperties
-import java.security.KeyPairGenerator
-import java.security.KeyStore
-
-object KeyGeneratorHelper {
-
-    private const val ANDROID_KEYSTORE = "AndroidKeyStore"
-
-    /**
-     * Generates an ECDSA P-256 key pair and stores it in the Android Keystore.
-     *
-     * @param alias Unique identifier for the key pair.
-     * @throws Exception if key generation fails.
-     */
-    fun generateECKeyPair(alias: String) {
-        try {
-            val keyStore = KeyStore.getInstance(ANDROID_KEYSTORE).apply { load(null) }
-
-            // Check if the key already exists
-            if (keyStore.containsAlias(alias)) {
-                throw Exception("Key with alias \"$alias\" already exists.")
-            }
-
-            val keyPairGenerator = KeyPairGenerator.getInstance(
-                KeyProperties.KEY_ALGORITHM_EC,
-                ANDROID_KEYSTORE
-            )
-
-            val parameterSpec = KeyGenParameterSpec.Builder(
-                alias,
-                KeyProperties.PURPOSE_SIGN or KeyProperties.PURPOSE_VERIFY
-            )
-                .setAlgorithmParameterSpec(java.security.spec.ECGenParameterSpec("secp256r1"))
-                .setDigests(KeyProperties.DIGEST_SHA256, KeyProperties.DIGEST_SHA384, KeyProperties.DIGEST_SHA512)
-                .setUserAuthenticationRequired(false) // Set to true if you require user authentication
-                .build()
-
-            keyPairGenerator.initialize(parameterSpec)
-            keyPairGenerator.generateKeyPair()
-        } catch (e: Exception) {
-            throw Exception("Failed to generate EC key pair: ${e.message}", e)
-        }
-    }
-}

dialer/android/app/src/main/kotlin/com/icing/dialer/KeystoreHelper.kt

@@ -1,6 +1,6 @@
 package com.icing.dialer
 
-import java.security.PrivateKey
+import android.os.Build
 import android.security.keystore.KeyGenParameterSpec
 import android.security.keystore.KeyProperties
 import android.util.Base64
@@ -8,15 +8,21 @@ import io.flutter.plugin.common.MethodCall
 import io.flutter.plugin.common.MethodChannel
 import java.security.KeyPairGenerator
 import java.security.KeyStore
+import java.security.PrivateKey
 import java.security.Signature
+import java.security.spec.ECGenParameterSpec
 
 class KeystoreHelper(private val call: MethodCall, private val result: MethodChannel.Result) {
 
     private val ANDROID_KEYSTORE = "AndroidKeyStore"
 
     fun handleMethodCall() {
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.R) {
+            result.error("UNSUPPORTED_API", "ED25519 requires Android 11 (API 30) or higher", null)
+            return
+        }
         when (call.method) {
-            "generateKeyPair" -> generateECKeyPair()
+            "generateKeyPair" -> generateEDKeyPair()
             "signData" -> signData()
             "getPublicKey" -> getPublicKey()
             "deleteKeyPair" -> deleteKeyPair()
@@ -25,7 +31,7 @@ class KeystoreHelper(private val call: MethodCall, private val result: MethodCha
         }
     }
 
-    private fun generateECKeyPair() {
+    private fun generateEDKeyPair() {
         val alias = call.argument<String>("alias")
         if (alias == null) {
             result.error("INVALID_ARGUMENT", "Alias is required", null)
@@ -44,16 +50,14 @@ class KeystoreHelper(private val call: MethodCall, private val result: MethodCha
                 KeyProperties.KEY_ALGORITHM_EC,
                 ANDROID_KEYSTORE
             )
-
             val parameterSpec = KeyGenParameterSpec.Builder(
                 alias,
                 KeyProperties.PURPOSE_SIGN or KeyProperties.PURPOSE_VERIFY
             )
-                .setAlgorithmParameterSpec(java.security.spec.ECGenParameterSpec("secp256r1"))
-                .setDigests(KeyProperties.DIGEST_SHA256, KeyProperties.DIGEST_SHA384, KeyProperties.DIGEST_SHA512)
+                .setAlgorithmParameterSpec(ECGenParameterSpec("ed25519"))
+                .setDigests(KeyProperties.DIGEST_SHA256)
                 .setUserAuthenticationRequired(false)
                 .build()
-
             keyPairGenerator.initialize(parameterSpec)
             keyPairGenerator.generateKeyPair()
 
@@ -73,17 +77,14 @@ class KeystoreHelper(private val call: MethodCall, private val result: MethodCha
 
         try {
             val keyStore = KeyStore.getInstance(ANDROID_KEYSTORE).apply { load(null) }
-
             val privateKey = keyStore.getKey(alias, null) as? PrivateKey ?: run {
                 result.error("KEY_NOT_FOUND", "Private key not found for alias \"$alias\".", null)
                 return
             }
-
-            val signature = Signature.getInstance("SHA256withECDSA")
+            val signature = Signature.getInstance("Ed25519")
             signature.initSign(privateKey)
             signature.update(data.toByteArray())
             val signedBytes = signature.sign()
-
             val signatureBase64 = Base64.encodeToString(signedBytes, Base64.DEFAULT)
             result.success(signatureBase64)
         } catch (e: Exception) {

dialer/android/app/src/main/kotlin/com/icing/dialer/PublicKeyRetriever.kt

@@ -1,30 +0,0 @@
-package com.icing.dialer
-
-import java.security.KeyStore
-import java.security.PublicKey
-import android.util.Base64
-
-object PublicKeyHelper {
-
-    private const val ANDROID_KEYSTORE = "AndroidKeyStore"
-
-    /**
-     * Retrieves the public key associated with the given alias.
-     *
-     * @param alias The alias of the key pair.
-     * @return The public key as a Base64-encoded string.
-     * @throws Exception if retrieval fails.
-     */
-    fun getPublicKey(alias: String): String {
-        try {
-            val keyStore = KeyStore.getInstance(ANDROID_KEYSTORE).apply { load(null) }
-
-            val certificate = keyStore.getCertificate(alias) ?: throw Exception("Certificate not found for alias \"$alias\".")
-            val publicKey: PublicKey = certificate.publicKey
-
-            return Base64.encodeToString(publicKey.encoded, Base64.DEFAULT)
-        } catch (e: Exception) {
-            throw Exception("Failed to retrieve public key: ${e.message}", e)
-        }
-    }
-}

dialer/android/app/src/main/kotlin/com/icing/dialer/Signer.kt

@@ -1,37 +0,0 @@
-package com.icing.dialer
-
-import android.security.keystore.KeyProperties
-import java.security.KeyStore
-import java.security.Signature
-import android.util.Base64
-import java.security.PrivateKey
-
-object SignerHelper {
-
-    private const val ANDROID_KEYSTORE = "AndroidKeyStore"
-
-    /**
-     * Signs the provided data using the private key associated with the given alias.
-     *
-     * @param alias The alias of the key pair.
-     * @param data The data to sign.
-     * @return The signature as a Base64-encoded string.
-     * @throws Exception if signing fails.
-     */
-    fun signData(alias: String, data: ByteArray): String {
-        try {
-            val keyStore = KeyStore.getInstance(ANDROID_KEYSTORE).apply { load(null) }
-
-            val privateKey = keyStore.getKey(alias, null) as? PrivateKey?: throw Exception("Private key not found for alias \"$alias\".")
-
-            val signature = Signature.getInstance("SHA256withECDSA")
-            signature.initSign(privateKey)
-            signature.update(data)
-            val signedBytes = signature.sign()
-
-            return Base64.encodeToString(signedBytes, Base64.DEFAULT)
-        } catch (e: Exception) {
-            throw Exception("Failed to sign data: ${e.message}", e)
-        }
-    }
-}

dialer/android/app/src/main/kotlin/com/icing/dialer/activities/MainActivity.kt

@@ -1,71 +1,369 @@
 package com.icing.dialer.activities
 
+import android.Manifest
+import android.app.role.RoleManager
+import android.content.Context
+import android.content.Intent
+import android.content.pm.PackageManager
 import android.database.Cursor
+import android.os.Build
 import android.os.Bundle
 import android.provider.CallLog
-import io.flutter.embedding.android.FlutterActivity
-import io.flutter.embedding.engine.FlutterEngine
-import io.flutter.plugin.common.MethodCall
-import io.flutter.plugin.common.MethodChannel
+import android.telecom.TelecomManager
+import android.telephony.SubscriptionManager
+import android.telephony.SubscriptionInfo
+import android.util.Log
+import androidx.core.content.ContextCompat
 import com.icing.dialer.KeystoreHelper
 import com.icing.dialer.services.CallService
+import com.icing.dialer.services.MyInCallService
+import io.flutter.embedding.android.FlutterActivity
+import io.flutter.embedding.engine.FlutterEngine
+import io.flutter.plugin.common.MethodChannel
 
-class MainActivity: FlutterActivity() {
-    // Existing channel for keystore operations.
+class MainActivity : FlutterActivity() {
     private val KEYSTORE_CHANNEL = "com.example.keystore"
-    // New channel for call log access.
     private val CALLLOG_CHANNEL = "com.example.calllog"
-    
     private val CALL_CHANNEL = "call_service"
+    private val TAG = "MainActivity"
+    private val REQUEST_CODE_SET_DEFAULT_DIALER = 1001
+    private val REQUEST_CODE_CALL_LOG_PERMISSION = 1002
+    private var pendingIncomingCall: Pair<String?, Boolean>? = null
+    private var wasPhoneLocked: Boolean = false
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        Log.d(TAG, "onCreate started")
+        wasPhoneLocked = intent.getBooleanExtra("wasPhoneLocked", false)
+        Log.d(TAG, "Was phone locked at start: $wasPhoneLocked")
+        updateLockScreenFlags(intent)
+        handleIncomingCallIntent(intent)
+    }
+
+    override fun onNewIntent(intent: Intent) {
+        super.onNewIntent(intent)
+        setIntent(intent)
+        wasPhoneLocked = intent.getBooleanExtra("wasPhoneLocked", false)
+        Log.d(TAG, "onNewIntent, wasPhoneLocked: $wasPhoneLocked")
+        updateLockScreenFlags(intent)
+        handleIncomingCallIntent(intent)
+    }
+
+    private fun updateLockScreenFlags(intent: Intent?) {
+        val isIncomingCall = intent?.getBooleanExtra("isIncomingCall", false) ?: false
+        if (isIncomingCall && wasPhoneLocked) {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O_MR1) {
+                setShowWhenLocked(true)
+                setTurnScreenOn(true)
+            } else {
+                @Suppress("DEPRECATION")
+                window.addFlags(
+                    android.view.WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED or
+                    android.view.WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON
+                )
+            }
+            Log.d(TAG, "Enabled showWhenLocked and turnScreenOn for incoming call")
+        } else {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O_MR1) {
+                setShowWhenLocked(false)
+                setTurnScreenOn(false)
+            } else {
+                @Suppress("DEPRECATION")
+                window.clearFlags(
+                    android.view.WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED or
+                    android.view.WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON
+                )
+            }
+            Log.d(TAG, "Disabled showWhenLocked and turnScreenOn for normal usage")
+        }
+    }
 
     override fun configureFlutterEngine(flutterEngine: FlutterEngine) {
         super.configureFlutterEngine(flutterEngine)
+        Log.d(TAG, "Configuring Flutter engine")
+        MyInCallService.channel = MethodChannel(flutterEngine.dartExecutor.binaryMessenger, CALL_CHANNEL)
 
-        // Call service channel
-        MethodChannel(flutterEngine.dartExecutor.binaryMessenger, CALL_CHANNEL).setMethodCallHandler { call, result ->
+        MethodChannel(flutterEngine.dartExecutor.binaryMessenger, CALL_CHANNEL)
+            .setMethodCallHandler { call, result ->
                 when (call.method) {
-                "makeGsmCall" -> {
+                    "permissionsGranted" -> {
+                        Log.d(TAG, "Received permissionsGranted from Flutter")
+                        pendingIncomingCall?.let { (phoneNumber, showScreen) ->
+                            if (showScreen) {
+                                MyInCallService.channel?.invokeMethod("incomingCallFromNotification", mapOf(
+                                    "phoneNumber" to phoneNumber,
+                                    "wasPhoneLocked" to wasPhoneLocked
+                                ))
+                                pendingIncomingCall = null
+                            }
+                        }
+                        result.success(true)
+                    }                    "makeGsmCall" -> {
                         val phoneNumber = call.argument<String>("phoneNumber")
+                        val simSlot = call.argument<Int>("simSlot") ?: 0
                         if (phoneNumber != null) {
-                        CallService.makeGsmCall(this, phoneNumber)
-                        result.success("Calling $phoneNumber")
+                            val success = CallService.makeGsmCall(this, phoneNumber, simSlot)
+                            if (success) {
+                                result.success(mapOf("status" to "calling", "phoneNumber" to phoneNumber))
+                            } else {
+                                result.error("CALL_FAILED", "Failed to initiate call", null)
+                            }
                         } else {
                             result.error("INVALID_PHONE_NUMBER", "Phone number is required", null)
                         }
                     }
                     "hangUpCall" -> {
-                    CallService.hangUpCall(this)
-                    result.success("Call ended")
+                        val success = MyInCallService.currentCall?.let {
+                            it.disconnect()
+                            Log.d(TAG, "Call disconnected")
+                            MyInCallService.channel?.invokeMethod("callEnded", mapOf(
+                                "callId" to it.details.handle.toString(),
+                                "wasPhoneLocked" to wasPhoneLocked
+                            ))
+                            true
+                        } ?: false
+                        if (success) {
+                            result.success(mapOf("status" to "ended"))
+                            if (wasPhoneLocked) {
+                                Log.d(TAG, "Finishing and removing task after hangup, phone was locked")
+                                finishAndRemoveTask()
+                            }
+                        } else {
+                            Log.w(TAG, "No active call to hang up")
+                            result.error("HANGUP_FAILED", "No active call to hang up", null)
+                        }
+                    }
+                    "answerCall" -> {
+                        val success = MyInCallService.currentCall?.let {
+                            it.answer(0)
+                            Log.d(TAG, "Answered call")
+                            true
+                        } ?: false
+                        if (success) {
+                            result.success(mapOf("status" to "answered"))
+                        } else {
+                            Log.w(TAG, "No active call to answer")
+                            result.error("ANSWER_FAILED", "No active call to answer", null)
+                        }
+                    }
+                    "callEndedFromFlutter" -> {
+                        Log.d(TAG, "Call ended from Flutter, wasPhoneLocked: $wasPhoneLocked")
+                        if (wasPhoneLocked) {
+                            finishAndRemoveTask()
+                            Log.d(TAG, "Finishing and removing task after call ended, phone was locked")
+                        }
+                        result.success(true)
+                    }
+                    "getCallState" -> {
+                        val stateStr = when (MyInCallService.currentCall?.state) {
+                            android.telecom.Call.STATE_ACTIVE -> "active"
+                            android.telecom.Call.STATE_RINGING -> "ringing"
+                            android.telecom.Call.STATE_DIALING -> "dialing"
+                            android.telecom.Call.STATE_DISCONNECTED -> "disconnected"
+                            android.telecom.Call.STATE_DISCONNECTING -> "disconnecting"
+                            else -> "unknown"
+                        }
+                        Log.d(TAG, "getCallState called, returning: $stateStr")
+                        result.success(stateStr)
+                    }
+                    "muteCall" -> {
+                        val mute = call.argument<Boolean>("mute") ?: false
+                        val success = MyInCallService.currentCall?.let {
+                            MyInCallService.toggleMute(mute)
+                        } ?: false
+                        if (success) {
+                            Log.d(TAG, "Mute call set to $mute")
+                            result.success(mapOf("status" to "success"))
+                        } else {
+                            Log.w(TAG, "No active call or failed to mute")
+                            result.error("MUTE_FAILED", "No active call or failed to mute", null)
+                        }
+                    }
+                    "speakerCall" -> {
+                        val speaker = call.argument<Boolean>("speaker") ?: false
+                        val success = MyInCallService.currentCall?.let {
+                            MyInCallService.toggleSpeaker(speaker)
+                        } ?: false
+                        if (success) {
+                            Log.d(TAG, "Speaker call set to $speaker")
+                            result.success(mapOf("status" to "success"))
+                        } else {
+                            Log.w(TAG, "No active call or failed to set speaker")
+                            result.error("SPEAKER_FAILED", "No active call or failed to set speaker", null)
+                        }
+                    }
+                    "isDefaultDialer" -> {
+                        val isDefault = isDefaultDialer()
+                        Log.d(TAG, "isDefaultDialer called, returning: $isDefault")
+                        result.success(isDefault)
+                    }
+                    "requestDefaultDialer" -> {
+                        checkAndRequestDefaultDialer()
+                        result.success(true)
+                    }
+                    "sendDtmfTone" -> {
+                        val digit = call.argument<String>("digit")
+                        if (digit != null) {
+                            val success = MyInCallService.sendDtmfTone(digit)
+                            result.success(success)
+                        } else {
+                            result.error("INVALID_ARGUMENT", "Digit is null", null)
+                        }
+                    }
+                    "isDefaultDialer" -> {
+                        val isDefault = isDefaultDialer()
+                        Log.d(TAG, "isDefaultDialer called, returning: $isDefault")
+                        result.success(isDefault)
+                    }
+                    "requestDefaultDialer" -> {
+                        checkAndRequestDefaultDialer()
+                        result.success(true)
                     }
                     else -> result.notImplemented()
                 }
             }
 
-        // Set up the keystore channel.
         MethodChannel(flutterEngine.dartExecutor.binaryMessenger, KEYSTORE_CHANNEL)
             .setMethodCallHandler { call, result ->
-                // Delegate method calls to KeystoreHelper.
                 KeystoreHelper(call, result).handleMethodCall()
             }
 
-        // Set up the call log channel.
         MethodChannel(flutterEngine.dartExecutor.binaryMessenger, CALLLOG_CHANNEL)
             .setMethodCallHandler { call, result ->
-                if (call.method == "getCallLogs") {
+                when (call.method) {
+                    "getCallLogs" -> {
+                        if (ContextCompat.checkSelfPermission(this, Manifest.permission.READ_CALL_LOG) == PackageManager.PERMISSION_GRANTED) {
                             val callLogs = getCallLogs()
                             result.success(callLogs)
                         } else {
-                    result.notImplemented()
+                            requestPermissions(arrayOf(Manifest.permission.READ_CALL_LOG), REQUEST_CODE_CALL_LOG_PERMISSION)
+                            result.error("PERMISSION_DENIED", "Call log permission not granted", null)
+                        }
+                    }
+                    "getLatestCallLog" -> {
+                        if (ContextCompat.checkSelfPermission(this, Manifest.permission.READ_CALL_LOG) == PackageManager.PERMISSION_GRANTED) {
+                            val latestCallLog = getLatestCallLog()
+                            result.success(latestCallLog)
+                        } else {
+                            result.error("PERMISSION_DENIED", "Call log permission not granted", null)
+                        }
+                    }
+                    else -> result.notImplemented()
+                }
+            }
+    }
+
+    private fun isDefaultDialer(): Boolean {
+        val telecomManager = getSystemService(TELECOM_SERVICE) as TelecomManager
+        val currentDefault = telecomManager.defaultDialerPackage
+        Log.d(TAG, "Checking default dialer: current=$currentDefault, myPackage=$packageName")
+        return currentDefault == packageName
+    }
+
+    private fun checkAndRequestDefaultDialer() {
+        val telecomManager = getSystemService(TELECOM_SERVICE) as TelecomManager
+        val currentDefault = telecomManager.defaultDialerPackage
+        Log.d(TAG, "Current default dialer: $currentDefault, My package: $packageName")
+
+        if (currentDefault != packageName) {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+                val roleManager = getSystemService(Context.ROLE_SERVICE) as RoleManager
+                if (roleManager.isRoleAvailable(RoleManager.ROLE_DIALER) && !roleManager.isRoleHeld(RoleManager.ROLE_DIALER)) {
+                    val intent = roleManager.createRequestRoleIntent(RoleManager.ROLE_DIALER)
+                    startActivityForResult(intent, REQUEST_CODE_SET_DEFAULT_DIALER)
+                    Log.d(TAG, "Launched RoleManager intent for default dialer on API 29+")
+                }
+            } else {
+                val intent = Intent(TelecomManager.ACTION_CHANGE_DEFAULT_DIALER)
+                    .putExtra(TelecomManager.EXTRA_CHANGE_DEFAULT_DIALER_PACKAGE_NAME, packageName)
+                    .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                try {
+                    startActivityForResult(intent, REQUEST_CODE_SET_DEFAULT_DIALER)
+                    Log.d(TAG, "Launched TelecomManager intent for default dialer")
+                } catch (e: Exception) {
+                    Log.e(TAG, "Failed to launch default dialer prompt: ${e.message}", e)
+                    launchDefaultAppsSettings()
+                }
+            }
+        } else {
+            Log.d(TAG, "Already the default dialer")
+        }
+    }
+
+    private fun launchDefaultAppsSettings() {
+        val settingsIntent = Intent(android.provider.Settings.ACTION_MANAGE_DEFAULT_APPS_SETTINGS)
+        startActivity(settingsIntent)
+        Log.d(TAG, "Opened default apps settings as fallback")
+    }
+
+    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+        super.onActivityResult(requestCode, resultCode, data)
+        Log.d(TAG, "onActivityResult: requestCode=$requestCode, resultCode=$resultCode, data=$data")
+        if (requestCode == REQUEST_CODE_SET_DEFAULT_DIALER) {
+            if (resultCode == RESULT_OK) {
+                Log.d(TAG, "User accepted default dialer change")
+            } else {
+                Log.w(TAG, "Default dialer prompt canceled or failed (resultCode=$resultCode)")
+                launchDefaultAppsSettings()
+            }
+        }
+    }
+
+    override fun onRequestPermissionsResult(requestCode: Int, permissions: Array<out String>, grantResults: IntArray) {
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults)
+        if (requestCode == REQUEST_CODE_CALL_LOG_PERMISSION) {
+            if (grantResults.isNotEmpty() && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
+                Log.d(TAG, "Call log permission granted")
+                MyInCallService.channel?.invokeMethod("callLogPermissionGranted", null)
+            } else {
+                Log.w(TAG, "Call log permission denied")
             }
         }
     }
 
-    /**
-     * Queries the Android call log and returns a list of maps.
-     * Each map contains keys: "number", "type", "date", and "duration".
-     */
     private fun getCallLogs(): List<Map<String, Any?>> {
         val logsList = mutableListOf<Map<String, Any?>>()
+        val cursor: Cursor? = contentResolver.query(
+            CallLog.Calls.CONTENT_URI, null, null, null, CallLog.Calls.DATE + " DESC"
+        )
+        cursor?.use {
+            while (it.moveToNext()) {
+                val number = it.getString(it.getColumnIndexOrThrow(CallLog.Calls.NUMBER))
+                val type = it.getInt(it.getColumnIndexOrThrow(CallLog.Calls.TYPE))
+                val date = it.getLong(it.getColumnIndexOrThrow(CallLog.Calls.DATE))
+                val duration = it.getLong(it.getColumnIndexOrThrow(CallLog.Calls.DURATION))
+                
+                // Extract subscription ID (SIM card info) if available
+                var subscriptionId: Int? = null
+                var simName: String? = null
+                try {
+                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP_MR1) {
+                        val subIdColumnIndex = it.getColumnIndex("subscription_id")
+                        if (subIdColumnIndex >= 0) {
+                            subscriptionId = it.getInt(subIdColumnIndex)
+                            // Get the actual SIM name
+                            simName = getSimNameFromSubscriptionId(subscriptionId)
+                        }
+                    }
+                } catch (e: Exception) {
+                    Log.w(TAG, "Failed to get subscription_id: ${e.message}")
+                }
+
+                val map = mutableMapOf<String, Any?>(
+                    "number" to number,
+                    "type" to type,
+                    "date" to date,
+                    "duration" to duration,
+                    "subscription_id" to subscriptionId,
+                    "sim_name" to simName
+                )
+                logsList.add(map)
+            }
+        }
+        return logsList
+    }
+
+    private fun getLatestCallLog(): Map<String, Any?>? {
         val cursor: Cursor? = contentResolver.query(
             CallLog.Calls.CONTENT_URI, 
             null, 
@@ -73,22 +371,89 @@ class MainActivity: FlutterActivity() {
             null, 
             CallLog.Calls.DATE + " DESC"
         )
-        if (cursor != null) {
-            while (cursor.moveToNext()) {
-                val number = cursor.getString(cursor.getColumnIndexOrThrow(CallLog.Calls.NUMBER))
-                val type = cursor.getInt(cursor.getColumnIndexOrThrow(CallLog.Calls.TYPE))
-                val date = cursor.getLong(cursor.getColumnIndexOrThrow(CallLog.Calls.DATE))
-                val duration = cursor.getLong(cursor.getColumnIndexOrThrow(CallLog.Calls.DURATION))
+        cursor?.use {
+            if (it.moveToNext()) {
+                val number = it.getString(it.getColumnIndexOrThrow(CallLog.Calls.NUMBER))
+                val type = it.getInt(it.getColumnIndexOrThrow(CallLog.Calls.TYPE))
+                val date = it.getLong(it.getColumnIndexOrThrow(CallLog.Calls.DATE))
+                val duration = it.getLong(it.getColumnIndexOrThrow(CallLog.Calls.DURATION))
                 
-                val map = HashMap<String, Any?>()
-                map["number"] = number
-                map["type"] = type  // Typically: 1 for incoming, 2 for outgoing, 3 for missed.
-                map["date"] = date
-                map["duration"] = duration
-                logsList.add(map)
+                // Extract subscription ID (SIM card info) if available
+                var subscriptionId: Int? = null
+                var simName: String? = null
+                try {
+                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP_MR1) {
+                        val subIdColumnIndex = it.getColumnIndex("subscription_id")
+                        if (subIdColumnIndex >= 0) {
+                            subscriptionId = it.getInt(subIdColumnIndex)
+                            // Get the actual SIM name
+                            simName = getSimNameFromSubscriptionId(subscriptionId)
+                        }
+                    }
+                } catch (e: Exception) {
+                    Log.w(TAG, "Failed to get subscription_id: ${e.message}")
+                }
+
+                return mapOf(
+                    "number" to number,
+                    "type" to type,
+                    "date" to date,
+                    "duration" to duration,
+                    "subscription_id" to subscriptionId,
+                    "sim_name" to simName
+                )
+            }
+        }
+        return null
+    }
+
+    private fun getSimNameFromSubscriptionId(subscriptionId: Int?): String? {
+        if (subscriptionId == null) return null
+        
+        try {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP_MR1) {
+                val subscriptionManager = getSystemService(Context.TELEPHONY_SUBSCRIPTION_SERVICE) as SubscriptionManager
+                val subscriptionInfo: SubscriptionInfo? = subscriptionManager.getActiveSubscriptionInfo(subscriptionId)
+                
+                return subscriptionInfo?.let { info ->
+                    // Try to get display name first, fallback to carrier name, then generic name
+                    when {
+                        !info.displayName.isNullOrBlank() && info.displayName.toString() != info.subscriptionId.toString() -> {
+                            info.displayName.toString()
+                        }
+                        !info.carrierName.isNullOrBlank() -> {
+                            info.carrierName.toString()
+                        }
+                        else -> "SIM ${info.simSlotIndex + 1}"
+                    }
+                }
+            }
+        } catch (e: Exception) {
+            Log.w(TAG, "Failed to get SIM name for subscription $subscriptionId: ${e.message}")
+        }
+        
+        // Fallback to generic name
+        return "SIM ${subscriptionId + 1}"
+    }
+
+    private fun handleIncomingCallIntent(intent: Intent?) {
+        intent?.let {
+            if (it.getBooleanExtra("isIncomingCall", false)) {
+                val phoneNumber = it.getStringExtra("phoneNumber")
+                val showScreen = it.getBooleanExtra("showIncomingCallScreen", false)
+                Log.d(TAG, "Received incoming call intent for $phoneNumber, showScreen=$showScreen, wasPhoneLocked=$wasPhoneLocked")
+                if (showScreen) {
+                    if (MyInCallService.channel != null) {
+                        MyInCallService.channel?.invokeMethod("incomingCallFromNotification", mapOf(
+                            "phoneNumber" to phoneNumber,
+                            "wasPhoneLocked" to wasPhoneLocked
+                        ))
+                    } else {
+                        pendingIncomingCall = Pair(phoneNumber, true)
+                        Log.d(TAG, "Flutter channel not ready, storing pending call: $phoneNumber")
+                    }
+                }
             }
-            cursor.close()
         }
-        return logsList
     }
 }

dialer/android/app/src/main/kotlin/com/icing/dialer/services/CallConnectionService.kt

@@ -0,0 +1,82 @@
+// package com.icing.dialer.services
+
+// import android.telecom.Connection
+// import android.telecom.ConnectionService
+// import android.telecom.PhoneAccountHandle
+// import android.telecom.TelecomManager
+// import android.telecom.DisconnectCause
+// import android.util.Log
+// import io.flutter.plugin.common.MethodChannel
+
+// class CallConnectionService : ConnectionService() {
+//     companion object {
+//         var channel: MethodChannel? = null
+//         private const val TAG = "CallConnectionService"
+//     }
+
+//     init {
+//         Log.d(TAG, "CallConnectionService initialized")
+//     }
+
+//     override fun onCreate() {
+//         super.onCreate()
+//         Log.d(TAG, "Service created")
+//     }
+
+//     override fun onDestroy() {
+//         super.onDestroy()
+//         Log.d(TAG, "Service destroyed")
+//     }
+
+//     override fun onCreateOutgoingConnection(
+//         connectionManagerPhoneAccount: PhoneAccountHandle?,
+//         request: android.telecom.ConnectionRequest
+//     ): Connection {
+//         Log.d(TAG, "Creating outgoing connection for ${request.address}, account: $connectionManagerPhoneAccount")
+//         val connection = object : Connection() {
+//             override fun onStateChanged(state: Int) {
+//                 super.onStateChanged(state)
+//                 Log.d(TAG, "Connection state changed: $state")
+//                 val stateStr = when (state) {
+//                     STATE_DIALING -> "dialing"
+//                     STATE_ACTIVE -> "active"
+//                     STATE_DISCONNECTED -> "disconnected"
+//                     else -> "unknown"
+//                 }
+//                 channel?.invokeMethod("callStateChanged", mapOf("state" to stateStr, "phoneNumber" to request.address.toString()))
+//             }
+
+//             override fun onDisconnect() {
+//                 Log.d(TAG, "Connection disconnected")
+//                 setDisconnected(DisconnectCause(DisconnectCause.LOCAL))
+//                 destroy()
+//             }
+//         }
+//         connection.setAddress(request.address, TelecomManager.PRESENTATION_ALLOWED)
+//         connection.setInitialized()
+//         connection.setDialing()
+//         return connection
+//     }
+
+//     override fun onCreateIncomingConnection(
+//         connectionManagerPhoneAccount: PhoneAccountHandle?,
+//         request: android.telecom.ConnectionRequest
+//     ): Connection {
+//         Log.d(TAG, "Creating incoming connection for ${request.address}, account: $connectionManagerPhoneAccount")
+//         val connection = object : Connection() {
+//             override fun onAnswer() {
+//                 Log.d(TAG, "Connection answered")
+//                 setActive()
+//             }
+
+//             override fun onDisconnect() {
+//                 Log.d(TAG, "Connection disconnected")
+//                 setDisconnected(DisconnectCause(DisconnectCause.LOCAL))
+//                 destroy()
+//             }
+//         }
+//         connection.setAddress(request.address, TelecomManager.PRESENTATION_ALLOWED)
+//         connection.setRinging()
+//         return connection
+//     }
+// }

dialer/android/app/src/main/kotlin/com/icing/dialer/services/CallService.kt

@@ -1,30 +1,76 @@
 package com.icing.dialer.services
 
 import android.content.Context
-import android.content.Intent
 import android.net.Uri
-import android.telecom.TelecomManager
 import android.os.Build
+import android.os.Bundle
+import android.telecom.TelecomManager
 import android.util.Log
+import androidx.core.content.ContextCompat
+import android.content.pm.PackageManager
+import android.Manifest
 
 object CallService {
+    private val TAG = "CallService"
 
-    fun makeGsmCall(context: Context, phoneNumber: String) {
-        try {
-            val intent = Intent(Intent.ACTION_CALL)
-            intent.data = Uri.parse("tel:$phoneNumber")
-            context.startActivity(intent)
+    fun makeGsmCall(context: Context, phoneNumber: String, simSlot: Int = 0): Boolean {
+        return try {
+            val telecomManager = context.getSystemService(Context.TELECOM_SERVICE) as TelecomManager
+            val uri = Uri.parse("tel:$phoneNumber")
+
+            if (ContextCompat.checkSelfPermission(context, Manifest.permission.CALL_PHONE) == PackageManager.PERMISSION_GRANTED) {
+                // Get available phone accounts (SIM cards)
+                val phoneAccounts = telecomManager.callCapablePhoneAccounts
+                
+                if (phoneAccounts.isNotEmpty()) {
+                    // Select the appropriate SIM slot
+                    val selectedAccount = if (simSlot < phoneAccounts.size) {
+                        phoneAccounts[simSlot]
+                    } else {
+                        // Fallback to first available SIM if requested slot doesn't exist
+                        phoneAccounts[0]
+                    }
+                    
+                    val extras = Bundle().apply {
+                        putParcelable(TelecomManager.EXTRA_PHONE_ACCOUNT_HANDLE, selectedAccount)
+                    }
+                    
+                    telecomManager.placeCall(uri, extras)
+                    Log.d(TAG, "Initiated call to $phoneNumber using SIM slot $simSlot")
+                } else {
+                    // No SIM cards available, make call without specifying SIM
+                    telecomManager.placeCall(uri, Bundle())
+                    Log.d(TAG, "Initiated call to $phoneNumber without SIM selection (no SIMs available)")
+                }
+                true
+            } else {
+                Log.e(TAG, "CALL_PHONE permission not granted")
+                false
+            }
         } catch (e: Exception) {
-            Log.e("CallService", "Error making GSM call: ${e.message}")
+            Log.e(TAG, "Error making GSM call: ${e.message}", e)
+            false
         }
     }
 
-    fun hangUpCall(context: Context) {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+    fun hangUpCall(context: Context): Boolean {
+        return try {
+            if (MyInCallService.currentCall != null) {
+                MyInCallService.currentCall?.disconnect()
+                Log.d(TAG, "Disconnected active call via MyInCallService")
+                true
+            } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
                 val telecomManager = context.getSystemService(Context.TELECOM_SERVICE) as TelecomManager
                 telecomManager.endCall()
+                Log.d(TAG, "Ended call via TelecomManager (no active call in MyInCallService)")
+                true
             } else {
-            Log.e("CallService", "Hangup call is only supported on Android P or later.")
+                Log.e(TAG, "No active call and hangup not supported below Android P")
+                false
+            }
+        } catch (e: Exception) {
+            Log.e(TAG, "Error hanging up call: ${e.message}", e)
+            false
         }
     }
 }

dialer/android/app/src/main/kotlin/com/icing/dialer/services/MyInCallService.kt

@@ -0,0 +1,218 @@
+package com.icing.dialer.services
+
+import android.app.KeyguardManager
+import android.app.NotificationChannel
+import android.app.NotificationManager
+import android.app.PendingIntent
+import android.content.Context
+import android.content.Intent
+import android.media.AudioManager
+import android.os.Build
+import android.telecom.Call
+import android.telecom.InCallService
+import android.telecom.CallAudioState
+import android.util.Log
+import androidx.core.app.NotificationCompat
+import com.icing.dialer.activities.MainActivity
+import io.flutter.plugin.common.MethodChannel
+
+class MyInCallService : InCallService() {
+    companion object {
+        var channel: MethodChannel? = null
+        var currentCall: Call? = null
+        private const val TAG = "MyInCallService"
+        private const val NOTIFICATION_CHANNEL_ID = "incoming_call_channel"
+        private const val NOTIFICATION_ID = 1
+        var wasPhoneLocked: Boolean = false
+        private var instance: MyInCallService? = null
+
+        fun toggleMute(mute: Boolean): Boolean {
+            return instance?.let { service ->
+                try {
+                    service.setMuted(mute)
+                    Log.d(TAG, "Requested to set call mute state to $mute")
+                    true
+                } catch (e: Exception) {
+                    Log.e(TAG, "Failed to set mute state: $e")
+                    false
+                }
+            } ?: false
+        }
+
+        fun toggleSpeaker(speaker: Boolean): Boolean {
+            return instance?.let { service ->
+                try {
+                    val route = if (speaker) CallAudioState.ROUTE_SPEAKER else CallAudioState.ROUTE_EARPIECE
+                    service.setAudioRoute(route)
+                    Log.d(TAG, "Requested to set audio route to $route")
+                    true
+                } catch (e: Exception) {
+                    Log.e(TAG, "Failed to set audio route: $e")
+                    false
+                }
+            } ?: false
+        }
+
+        fun sendDtmfTone(digit: String): Boolean {
+            return instance?.let { service ->
+                try {
+                    currentCall?.let { call ->
+                        call.playDtmfTone(digit[0])
+                        call.stopDtmfTone()
+                        Log.d(TAG, "Sent DTMF tone: $digit")
+                        true
+                    } ?: false
+                } catch (e: Exception) {
+                    Log.e(TAG, "Failed to send DTMF tone: $e")
+                    false
+                }
+            } ?: false
+        }
+    }
+
+    private val callCallback = object : Call.Callback() {
+        override fun onStateChanged(call: Call, state: Int) {
+            super.onStateChanged(call, state)
+            val stateStr = when (state) {
+                Call.STATE_DIALING -> "dialing"
+                Call.STATE_ACTIVE -> "active"
+                Call.STATE_DISCONNECTED -> "disconnected"
+                Call.STATE_DISCONNECTING -> "disconnecting"
+                Call.STATE_RINGING -> "ringing"
+                else -> "unknown"
+            }
+            Log.d(TAG, "State changed: $stateStr for call ${call.details.handle}")
+            channel?.invokeMethod("callStateChanged", mapOf(
+                "callId" to call.details.handle.toString(),
+                "state" to stateStr,
+                "wasPhoneLocked" to wasPhoneLocked
+            ))
+            if (state == Call.STATE_RINGING) {
+                val keyguardManager = getSystemService(Context.KEYGUARD_SERVICE) as KeyguardManager
+                wasPhoneLocked = keyguardManager.isKeyguardLocked
+                Log.d(TAG, "Phone locked at ringing: $wasPhoneLocked")
+                showIncomingCallScreen(call.details.handle.toString().replace("tel:", ""))
+            } else if (state == Call.STATE_DISCONNECTED || state == Call.STATE_DISCONNECTING) {
+                Log.d(TAG, "Call ended: ${call.details.handle}, wasPhoneLocked: $wasPhoneLocked")
+                channel?.invokeMethod("callEnded", mapOf(
+                    "callId" to call.details.handle.toString(),
+                    "wasPhoneLocked" to wasPhoneLocked
+                ))
+                currentCall = null
+                cancelNotification()
+            }
+        }
+    }
+
+    override fun onCallAdded(call: Call) {
+        super.onCallAdded(call)
+        instance = this
+        currentCall = call
+        val stateStr = when (call.state) {
+            Call.STATE_DIALING -> "dialing"
+            Call.STATE_ACTIVE -> "active"
+            Call.STATE_RINGING -> "ringing"
+            else -> "dialing"
+        }
+        Log.d(TAG, "Call added: ${call.details.handle}, state: $stateStr")
+        channel?.invokeMethod("callAdded", mapOf(
+            "callId" to call.details.handle.toString(),
+            "state" to stateStr
+        ))
+        if (stateStr == "ringing") {
+            val keyguardManager = getSystemService(Context.KEYGUARD_SERVICE) as KeyguardManager
+            wasPhoneLocked = keyguardManager.isKeyguardLocked
+            Log.d(TAG, "Phone locked at call added: $wasPhoneLocked")
+            showIncomingCallScreen(call.details.handle.toString().replace("tel:", ""))
+        }
+        call.registerCallback(callCallback)
+        if (callAudioState != null) {
+        val audioState = callAudioState
+            channel?.invokeMethod("audioStateChanged", mapOf(
+                "route" to audioState.route,
+                "muted" to audioState.isMuted,
+                "speaker" to (audioState.route == CallAudioState.ROUTE_SPEAKER)
+            ))
+        } else {
+            Log.w("MyInCallService", "callAudioState is null in onCallAdded")
+        }
+    }
+
+    override fun onCallRemoved(call: Call) {
+        super.onCallRemoved(call)
+        Log.d(TAG, "Call removed: ${call.details.handle}, wasPhoneLocked: $wasPhoneLocked")
+        call.unregisterCallback(callCallback)
+        channel?.invokeMethod("callRemoved", mapOf(
+            "callId" to call.details.handle.toString(),
+            "wasPhoneLocked" to wasPhoneLocked
+        ))
+        currentCall = null
+        instance = null
+        cancelNotification()
+    }
+
+    override fun onCallAudioStateChanged(state: CallAudioState) {
+        super.onCallAudioStateChanged(state)
+        Log.d(TAG, "Audio state changed: route=${state.route}, muted=${state.isMuted}")
+        channel?.invokeMethod("audioStateChanged", mapOf(
+            "route" to state.route,
+            "muted" to state.isMuted,
+            "speaker" to (state.route == CallAudioState.ROUTE_SPEAKER)
+        ))
+    }
+
+    private fun showIncomingCallScreen(phoneNumber: String) {
+        val intent = Intent(this, MainActivity::class.java).apply {
+            flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP
+            putExtra("phoneNumber", phoneNumber)
+            putExtra("isIncomingCall", true)
+            putExtra("showIncomingCallScreen", true)
+            putExtra("wasPhoneLocked", wasPhoneLocked)
+        }
+
+        val keyguardManager = getSystemService(Context.KEYGUARD_SERVICE) as KeyguardManager
+        if (keyguardManager.isKeyguardLocked) {
+            startActivity(intent)
+            Log.d(TAG, "Launched MainActivity directly for locked screen, phoneNumber: $phoneNumber")
+        } else {
+            val notificationManager = getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                val channel = NotificationChannel(
+                    NOTIFICATION_CHANNEL_ID,
+                    "Incoming Calls",
+                    NotificationManager.IMPORTANCE_HIGH
+                ).apply {
+                    description = "Notifications for incoming calls"
+                    enableVibration(true)
+                    setShowBadge(true)
+                }
+                notificationManager.createNotificationChannel(channel)
+            }
+
+            val pendingIntent = PendingIntent.getActivity(
+                this, 0, intent,
+                PendingIntent.FLAG_UPDATE_CURRENT or (if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) PendingIntent.FLAG_IMMUTABLE else 0)
+            )
+
+            val notification = NotificationCompat.Builder(this, NOTIFICATION_CHANNEL_ID)
+                .setSmallIcon(android.R.drawable.ic_dialog_alert)
+                .setContentTitle("Incoming Call")
+                .setContentText("Call from $phoneNumber")
+                .setPriority(NotificationCompat.PRIORITY_HIGH)
+                .setFullScreenIntent(pendingIntent, true)
+                .setAutoCancel(true)
+                .setOngoing(true)
+                .build()
+
+            startActivity(intent)
+            notificationManager.notify(NOTIFICATION_ID, notification)
+            Log.d(TAG, "Launched MainActivity with notification for unlocked screen, phoneNumber: $phoneNumber")
+        }
+    }
+
+    private fun cancelNotification() {
+        val notificationManager = getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+        notificationManager.cancel(NOTIFICATION_ID)
+        Log.d(TAG, "Notification canceled")
+    }
+}

dialer/android/gradle.properties

@@ -2,4 +2,4 @@ org.gradle.jvmargs=-Xmx4G -XX:MaxMetaspaceSize=2G -XX:+HeapDumpOnOutOfMemoryErro
 android.useAndroidX=true
 android.enableJetifier=true
 dev.steenbakker.mobile_scanner.useUnbundled=true
-org.gradle.java.home=/usr/lib/jvm/java-17-openjdk-amd64
+# org.gradle.java.home=/usr/lib/jvm/java-17-openjdk-amd64

dialer/lib/core/config/app_config.dart

@@ -0,0 +1,14 @@
+class AppConfig {
+  // Private constructor to prevent instantiation
+  AppConfig._();
+  
+  // Global configuration
+  static bool isStealthMode = false;
+  
+  // App initialization
+  static Future<void> initialize() async {
+    const stealthFlag = String.fromEnvironment('STEALTH', defaultValue: 'false');
+    isStealthMode = stealthFlag.toLowerCase() == 'true';
+    print('Stealth mode is ${isStealthMode ? 'enabled' : 'disabled'}');
+  }
+}

dialer/lib/core/navigation/app_router.dart

@@ -0,0 +1,57 @@
+import 'package:flutter/material.dart';
+import '../../presentation/features/call/call_page.dart';
+import '../../presentation/features/call/incoming_call_page.dart';
+import '../../presentation/features/home/home_page.dart';
+import '../../presentation/features/settings/settings.dart';  // Updated import
+import '../../presentation/features/contacts/contact_page.dart';
+import '../../presentation/features/composition/composition.dart';
+import 'dart:typed_data';
+
+class AppRouter {
+  static Route<dynamic> generateRoute(RouteSettings settings) {
+    switch (settings.name) {
+      case '/':
+        return MaterialPageRoute(builder: (_) => const MyHomePage());
+        
+      case '/settings':
+        return MaterialPageRoute(builder: (_) => const SettingsPage());  // Now correctly imported
+        
+      case '/composition':
+        return MaterialPageRoute(builder: (_) => const CompositionPage());
+        
+      case '/contacts':
+        return MaterialPageRoute(builder: (_) => const ContactPage());
+        
+      case '/call':
+        final args = settings.arguments as Map<String, dynamic>;
+        return MaterialPageRoute(
+          settings: settings,
+          builder: (_) => CallPage(
+            displayName: args['displayName'] as String,
+            phoneNumber: args['phoneNumber'] as String,
+            thumbnail: args['thumbnail'] as Uint8List?,
+          ),
+        );
+        
+      case '/incoming_call':
+        final args = settings.arguments as Map<String, dynamic>;
+        return MaterialPageRoute(
+          settings: settings,
+          builder: (_) => IncomingCallPage(
+            displayName: args['displayName'] as String,
+            phoneNumber: args['phoneNumber'] as String,
+            thumbnail: args['thumbnail'] as Uint8List?,
+          ),
+        );
+        
+      default:
+        return MaterialPageRoute(
+          builder: (_) => Scaffold(
+            body: Center(
+              child: Text('No route defined for ${settings.name}'),
+            ),
+          ),
+        );
+    }
+  }
+}

dialer/lib/domain/services/block_service.dart

@@ -0,0 +1,78 @@
+import 'package:flutter/material.dart';
+import 'package:shared_preferences/shared_preferences.dart';
+
+/// Service for managing blocked phone numbers
+class BlockService {
+  static const String _blockedNumbersKey = 'blocked_numbers';
+
+  // Private constructor
+  BlockService._privateConstructor();
+
+  // Singleton instance
+  static final BlockService _instance = BlockService._privateConstructor();
+
+  // Factory constructor to return the same instance
+  factory BlockService() {
+    return _instance;
+  }
+
+  /// Block a phone number
+  Future<bool> blockNumber(String phoneNumber) async {
+    try {
+      final prefs = await SharedPreferences.getInstance();
+      final blockedNumbers = prefs.getStringList(_blockedNumbersKey) ?? [];
+
+      // Don't add if already blocked
+      if (blockedNumbers.contains(phoneNumber)) {
+        return true;
+      }
+
+      blockedNumbers.add(phoneNumber);
+      return await prefs.setStringList(_blockedNumbersKey, blockedNumbers);
+    } catch (e) {
+      debugPrint('Error blocking number: $e');
+      return false;
+    }
+  }
+
+  /// Unblock a phone number
+  Future<bool> unblockNumber(String phoneNumber) async {
+    try {
+      final prefs = await SharedPreferences.getInstance();
+      final blockedNumbers = prefs.getStringList(_blockedNumbersKey) ?? [];
+
+      if (!blockedNumbers.contains(phoneNumber)) {
+        return true;
+      }
+
+      blockedNumbers.remove(phoneNumber);
+      return await prefs.setStringList(_blockedNumbersKey, blockedNumbers);
+    } catch (e) {
+      debugPrint('Error unblocking number: $e');
+      return false;
+    }
+  }
+
+  /// Check if a number is blocked
+  Future<bool> isNumberBlocked(String phoneNumber) async {
+    try {
+      final prefs = await SharedPreferences.getInstance();
+      final blockedNumbers = prefs.getStringList(_blockedNumbersKey) ?? [];
+      return blockedNumbers.contains(phoneNumber);
+    } catch (e) {
+      debugPrint('Error checking if number is blocked: $e');
+      return false;
+    }
+  }
+
+  /// Get all blocked numbers
+  Future<List<String>> getBlockedNumbers() async {
+    try {
+      final prefs = await SharedPreferences.getInstance();
+      return prefs.getStringList(_blockedNumbersKey) ?? [];
+    } catch (e) {
+      debugPrint('Error getting blocked numbers: $e');
+      return [];
+    }
+  }
+}

dialer/lib/domain/services/call_service.dart

@@ -0,0 +1,720 @@
+import 'dart:async';
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+import 'package:shared_preferences/shared_preferences.dart';
+import '../../presentation/features/call/call_page.dart';
+import '../../presentation/features/call/incoming_call_page.dart'; // Import the new page
+import 'contact_service.dart';
+// Import for history update callback
+import '../../presentation/features/history/history_page.dart';
+
+class CallService {
+  static const MethodChannel _channel = MethodChannel('call_service');
+  static String? currentPhoneNumber;
+  static String? currentDisplayName;
+  static Uint8List? currentThumbnail;
+  static int? currentSimSlot; // Track which SIM slot is being used
+  static bool _isCallPageVisible = false;
+  static Map<String, dynamic>? _pendingCall;
+  static bool wasPhoneLocked = false;
+  static String? _activeCallNumber;
+  static bool _isNavigating = false;
+  final ContactService _contactService = ContactService();
+  final _callStateController = StreamController<String>.broadcast();
+  final _audioStateController =
+      StreamController<Map<String, dynamic>>.broadcast();
+  final _simStateController = StreamController<int?>.broadcast();
+  Map<String, dynamic>? _currentAudioState;
+
+  static final GlobalKey<NavigatorState> navigatorKey =
+      GlobalKey<NavigatorState>();
+  Stream<String> get callStateStream => _callStateController.stream;
+  Stream<Map<String, dynamic>> get audioStateStream =>
+      _audioStateController.stream;
+  Stream<int?> get simStateStream => _simStateController.stream;
+  Map<String, dynamic>? get currentAudioState => _currentAudioState;
+  // Getter for current SIM slot
+  static int? get getCurrentSimSlot => currentSimSlot;
+  // Get SIM display name for the current call
+  static String? getCurrentSimDisplayName() {
+    if (currentSimSlot == null) return null;
+    return "SIM ${currentSimSlot! + 1}";
+  }
+
+  // Cancel pending SIM switch (used when user manually hangs up)
+  void cancelPendingSimSwitch() {
+    if (_pendingSimSwitch != null) {
+      print('CallService: Canceling pending SIM switch due to manual hangup');
+      _pendingSimSwitch = null;
+      _manualHangupFlag = true; // Mark that hangup was manual
+      print('CallService: Manual hangup flag set to $_manualHangupFlag');
+    } else {
+      print('CallService: No pending SIM switch to cancel');
+      // Don't set manual hangup flag if there's no SIM switch to cancel
+    }
+  }
+
+  CallService() {
+    _channel.setMethodCallHandler((call) async {
+      print(
+          'CallService: Handling method call: ${call.method}, with args: ${call.arguments}');
+      switch (call.method) {
+        case "callAdded":
+          final phoneNumber = call.arguments["callId"] as String?;
+          final state = call.arguments["state"] as String?;
+          if (phoneNumber == null || state == null) {
+            print('CallService: Invalid callAdded args: $call.arguments');
+            return;
+          }
+          final decodedPhoneNumber =
+              Uri.decodeComponent(phoneNumber.replaceFirst('tel:', ''));
+          print('CallService: Decoded phone number: $decodedPhoneNumber');
+          if (_activeCallNumber != decodedPhoneNumber) {
+            currentPhoneNumber = decodedPhoneNumber;
+            if (currentDisplayName == null ||
+                currentDisplayName == currentPhoneNumber) {
+              await _fetchContactInfo(decodedPhoneNumber);
+            }
+          }
+          print(
+              'CallService: Call added, number: $currentPhoneNumber, displayName: $currentDisplayName, state: $state');
+          _callStateController.add(state);
+          if (state == "ringing") {
+            _handleIncomingCall(decodedPhoneNumber);
+          } else {
+            _navigateToCallPage();
+          }
+          break;
+        case "callStateChanged":
+          final state = call.arguments["state"] as String?;
+          wasPhoneLocked = call.arguments["wasPhoneLocked"] as bool? ?? false;
+          if (state == null) {
+            print(
+                'CallService: Invalid callStateChanged args: $call.arguments');
+            return;
+          }
+          print(
+              'CallService: State changed to $state, wasPhoneLocked: $wasPhoneLocked');
+          _callStateController.add(state);
+          if (state == "disconnected" || state == "disconnecting") {
+            print('CallService: ========== CALL DISCONNECTED ==========');
+            print(
+                'CallService: _pendingSimSwitch: ${_pendingSimSwitch != null}');
+            print('CallService: _manualHangupFlag: $_manualHangupFlag');
+            print('CallService: _isCallPageVisible: $_isCallPageVisible');
+
+            // Always close call page on disconnection - SIM switching should not prevent this
+            print('CallService: Calling _closeCallPage() on call disconnection');
+            _closeCallPage();
+            
+            // Reset manual hangup flag after successful page close
+            if (_manualHangupFlag) {
+              print(
+                  'CallService: Resetting manual hangup flag after page close');
+              _manualHangupFlag = false;
+            }
+            if (wasPhoneLocked) {
+              await _channel.invokeMethod("callEndedFromFlutter");
+            }
+            
+            // Notify history page to add the latest call
+            // Add a small delay to ensure call log is updated by the system
+            Timer(const Duration(milliseconds: 500), () {
+              HistoryPageState.addNewCallToHistory();
+            });
+            
+            _activeCallNumber = null;
+            // Handle pending SIM switch after call is disconnected
+            _handlePendingSimSwitch();
+          } else if (state == "active" || state == "dialing") {
+            final phoneNumber = call.arguments["callId"] as String?;
+            if (phoneNumber != null &&
+                _activeCallNumber !=
+                    Uri.decodeComponent(phoneNumber.replaceFirst('tel:', ''))) {
+              currentPhoneNumber =
+                  Uri.decodeComponent(phoneNumber.replaceFirst('tel:', ''));
+              if (currentDisplayName == null ||
+                  currentDisplayName == currentPhoneNumber) {
+                await _fetchContactInfo(currentPhoneNumber!);
+              }
+            } else if (currentPhoneNumber != null &&
+                _activeCallNumber != currentPhoneNumber) {
+              if (currentDisplayName == null ||
+                  currentDisplayName == currentPhoneNumber) {
+                await _fetchContactInfo(currentPhoneNumber!);
+              }
+            } else {
+              print(
+                  'CallService: Skipping fetch, active call: $_activeCallNumber, current: $currentPhoneNumber, displayName: $currentDisplayName');
+            }
+            _navigateToCallPage();
+          } else if (state == "ringing") {
+            final phoneNumber = call.arguments["callId"] as String?;
+            if (phoneNumber == null) {
+              print('CallService: Invalid ringing callId: $call.arguments');
+              return;
+            }
+            final decodedPhoneNumber =
+                Uri.decodeComponent(phoneNumber.replaceFirst('tel:', ''));
+            if (_activeCallNumber != decodedPhoneNumber) {
+              currentPhoneNumber = decodedPhoneNumber;
+              if (currentDisplayName == null ||
+                  currentDisplayName == currentPhoneNumber) {
+                await _fetchContactInfo(decodedPhoneNumber);
+              }
+            }
+            _handleIncomingCall(decodedPhoneNumber);
+          }
+          break;
+        case "callEnded":
+        case "callRemoved":
+          wasPhoneLocked = call.arguments["wasPhoneLocked"] as bool? ?? false;
+          print('CallService: ========== CALL ENDED/REMOVED ==========');
+          print('CallService: wasPhoneLocked: $wasPhoneLocked');
+          print('CallService: _pendingSimSwitch: ${_pendingSimSwitch != null}');
+          print('CallService: _manualHangupFlag: $_manualHangupFlag');
+          print('CallService: _isCallPageVisible: $_isCallPageVisible');
+
+          // Always close call page when call ends - SIM switching should not prevent this
+          print('CallService: Calling _closeCallPage() on call ended/removed');
+          _closeCallPage();
+          
+          // Reset manual hangup flag after closing page
+          if (_manualHangupFlag) {
+            print(
+                'CallService: Resetting manual hangup flag after callEnded');
+            _manualHangupFlag = false;
+          }
+          if (wasPhoneLocked) {
+            await _channel.invokeMethod("callEndedFromFlutter");
+          }
+          
+          // Notify history page to add the latest call
+          // Add a small delay to ensure call log is updated by the system
+          Timer(const Duration(milliseconds: 500), () {
+            HistoryPageState.addNewCallToHistory();
+          });
+          
+          currentPhoneNumber = null;
+          currentDisplayName = null;
+          currentThumbnail = null;
+          currentSimSlot = null; // Reset SIM slot when call ends
+          _simStateController.add(null); // Notify UI that SIM is cleared
+          _activeCallNumber = null;
+          break;
+        case "incomingCallFromNotification":
+          final phoneNumber = call.arguments["phoneNumber"] as String?;
+          wasPhoneLocked = call.arguments["wasPhoneLocked"] as bool? ?? false;
+          if (phoneNumber == null) {
+            print(
+                'CallService: Invalid incomingCallFromNotification args: $call.arguments');
+            return;
+          }
+          final decodedPhoneNumber = Uri.decodeComponent(phoneNumber);
+          if (_activeCallNumber != decodedPhoneNumber) {
+            currentPhoneNumber = decodedPhoneNumber;
+            if (currentDisplayName == null ||
+                currentDisplayName == currentPhoneNumber) {
+              await _fetchContactInfo(decodedPhoneNumber);
+            }
+          }
+          print(
+              'CallService: Incoming call from notification: $decodedPhoneNumber, displayName: $currentDisplayName, wasPhoneLocked: $wasPhoneLocked');
+          _handleIncomingCall(decodedPhoneNumber);
+          break;
+        case "audioStateChanged":
+          final route = call.arguments["route"] as int?;
+          final muted = call.arguments["muted"] as bool?;
+          final speaker = call.arguments["speaker"] as bool?;
+          print(
+              'CallService: Audio state changed, route: $route, muted: $muted, speaker: $speaker');
+          final audioState = {
+            "route": route,
+            "muted": muted,
+            "speaker": speaker,
+          };
+          _currentAudioState = audioState;
+          _audioStateController.add(audioState);
+          break;
+      }
+    });
+  }
+
+  Future<String?> getCallState() async {
+    try {
+      final state = await _channel.invokeMethod('getCallState');
+      print('CallService: getCallState returned: $state');
+      return state as String?;
+    } catch (e) {
+      print('CallService: Error getting call state: $e');
+      return null;
+    }
+  }
+
+  Future<Map<String, dynamic>> muteCall(BuildContext context,
+      {required bool mute}) async {
+    try {
+      print('CallService: Toggling mute to $mute');
+      final result = await _channel.invokeMethod('muteCall', {'mute': mute});
+      print('CallService: muteCall result: $result');
+      final resultMap = Map<String, dynamic>.from(result as Map);
+      if (resultMap['status'] != 'success') {
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(content: Text('Failed to toggle mute')),
+        );
+      }
+      return resultMap;
+    } catch (e) {
+      print('CallService: Error toggling mute: $e');
+      ScaffoldMessenger.of(context).showSnackBar(
+        SnackBar(content: Text('Error toggling mute: $e')),
+      );
+      return {'status': 'error', 'message': e.toString()};
+    }
+  }
+
+  Future<Map<String, dynamic>> speakerCall(BuildContext context,
+      {required bool speaker}) async {
+    try {
+      print('CallService: Toggling speaker to $speaker');
+      final result =
+          await _channel.invokeMethod('speakerCall', {'speaker': speaker});
+      print('CallService: speakerCall result: $result');
+      return Map<String, dynamic>.from(result);
+    } catch (e) {
+      print('CallService: Error toggling speaker: $e');
+      ScaffoldMessenger.of(context).showSnackBar(
+        SnackBar(content: Text('Failed to toggle speaker: $e')),
+      );
+      return {'status': 'error', 'message': e.toString()};
+    }
+  }
+
+  void dispose() {
+    _callStateController.close();
+    _audioStateController.close();
+  }
+
+  Future<void> _fetchContactInfo(String phoneNumber) async {
+    try {
+      print('CallService: Fetching contact info for $phoneNumber');
+      final contacts = await _contactService.fetchContacts();
+      print('CallService: Retrieved ${contacts.length} contacts');
+      final normalizedPhoneNumber = _normalizePhoneNumber(phoneNumber);
+      print('CallService: Normalized phone number: $normalizedPhoneNumber');
+      for (var contact in contacts) {
+        for (var phone in contact.phones) {
+          final normalizedContactNumber = _normalizePhoneNumber(phone.number);
+          print(
+              'CallService: Comparing $normalizedPhoneNumber with contact number $normalizedContactNumber');
+          if (normalizedContactNumber == normalizedPhoneNumber) {
+            currentDisplayName = contact.displayName;
+            currentThumbnail = contact.thumbnail;
+            print(
+                'CallService: Found contact - displayName: $currentDisplayName, thumbnail: ${currentThumbnail != null ? "present" : "null"}');
+            return;
+          }
+        }
+      }
+      currentDisplayName = phoneNumber;
+      currentThumbnail = null;
+      print(
+          'CallService: No contact match, using phoneNumber as displayName: $currentDisplayName');
+    } catch (e) {
+      print('CallService: Error fetching contact info: $e');
+      currentDisplayName = phoneNumber;
+      currentThumbnail = null;
+    }
+  }
+
+  String _normalizePhoneNumber(String number) {
+    return number
+        .replaceAll(RegExp(r'[\s\-\(\)]'), '')
+        .replaceFirst(RegExp(r'^\+'), '');
+  }
+
+  void _handleIncomingCall(String phoneNumber) {
+    if (_activeCallNumber == phoneNumber && _isCallPageVisible) {
+      print(
+          'CallService: Incoming call for $phoneNumber already active, skipping');
+      return;
+    }
+    _activeCallNumber = phoneNumber;
+
+    final context = navigatorKey.currentContext;
+    if (context == null) {
+      print(
+          'CallService: Context is null, queuing incoming call: $phoneNumber');
+      _pendingCall = {"phoneNumber": phoneNumber};
+      Future.delayed(Duration(milliseconds: 500), () => _checkPendingCall());
+    } else {
+      _navigateToIncomingCallPage(context);
+    }
+  }
+
+  Future<void> _checkPendingCall() async {
+    if (_pendingCall == null) {
+      print('CallService: No pending call to process');
+      return;
+    }
+
+    final phoneNumber = _pendingCall!["phoneNumber"];
+    if (_activeCallNumber == phoneNumber && _isCallPageVisible) {
+      print(
+          'CallService: Pending call for $phoneNumber already active, clearing');
+      _pendingCall = null;
+      return;
+    }
+
+    final context = navigatorKey.currentContext;
+    if (context != null) {
+      print('CallService: Processing queued call: $phoneNumber');
+      currentPhoneNumber = phoneNumber;
+      _activeCallNumber = phoneNumber;
+      await _fetchContactInfo(phoneNumber);
+      _navigateToIncomingCallPage(context);
+      _pendingCall = null;
+    } else {
+      print('CallService: Context still null, retrying...');
+      Future.delayed(Duration(milliseconds: 500), () => _checkPendingCall());
+    }
+  }
+
+  void _navigateToCallPage() {
+    if (_isNavigating) {
+      print('CallService: Navigation already in progress, skipping');
+      return;
+    }
+    _isNavigating = true;
+
+    final context = navigatorKey.currentContext;
+    if (context == null) {
+      print('CallService: Cannot navigate to CallPage, context is null');
+      _isNavigating = false;
+      return;
+    }
+    final currentRoute = ModalRoute.of(context)?.settings.name ?? 'unknown';
+    print(
+        'CallService: Navigating to CallPage, Visible: $_isCallPageVisible, Current Route: $currentRoute, Active Call: $_activeCallNumber, DisplayName: $currentDisplayName');
+    if (_isCallPageVisible &&
+        currentRoute == '/call' &&
+        _activeCallNumber == currentPhoneNumber) {
+      print(
+          'CallService: CallPage already visible for $_activeCallNumber, skipping navigation');
+      _isNavigating = false;
+      return;
+    }
+    if (_isCallPageVisible &&
+        currentRoute == '/incoming_call' &&
+        _activeCallNumber == currentPhoneNumber) {
+      print(
+          'CallService: Popping IncomingCallPage before navigating to CallPage');
+      Navigator.pop(context);
+      _isCallPageVisible = false;
+    }
+    if (currentPhoneNumber == null) {
+      print(
+          'CallService: Cannot navigate to CallPage, currentPhoneNumber is null');
+      _isNavigating = false;
+      return;
+    }
+    _activeCallNumber = currentPhoneNumber;
+    Navigator.push(
+      context,
+      MaterialPageRoute(
+        settings: const RouteSettings(name: '/call'),
+        builder: (context) => CallPage(
+          displayName: currentDisplayName ?? currentPhoneNumber!,
+          phoneNumber: currentPhoneNumber!,
+          thumbnail: currentThumbnail,
+        ),
+      ),
+    ).then((_) {
+      _isCallPageVisible = false;
+      _isNavigating = false;
+      print('CallService: CallPage popped, _isCallPageVisible set to false');
+    });
+    _isCallPageVisible = true;
+  }
+
+  void _navigateToIncomingCallPage(BuildContext context) {
+    if (_isNavigating) {
+      print('CallService: Navigation already in progress, skipping');
+      return;
+    }
+    _isNavigating = true;
+
+    final currentRoute = ModalRoute.of(context)?.settings.name ?? 'unknown';
+    print(
+        'CallService: Navigating to IncomingCallPage, Visible: $_isCallPageVisible, Current Route: $currentRoute, Active Call: $_activeCallNumber, DisplayName: $currentDisplayName');
+    if (_isCallPageVisible &&
+        currentRoute == '/incoming_call' &&
+        _activeCallNumber == currentPhoneNumber) {
+      print(
+          'CallService: IncomingCallPage already visible for $_activeCallNumber, skipping navigation');
+      _isNavigating = false;
+      return;
+    }
+    if (_isCallPageVisible && currentRoute == '/call') {
+      print('CallService: CallPage visible, not showing IncomingCallPage');
+      _isNavigating = false;
+      return;
+    }
+    if (currentPhoneNumber == null) {
+      print(
+          'CallService: Cannot navigate to IncomingCallPage, currentPhoneNumber is null');
+      _isNavigating = false;
+      return;
+    }
+    Navigator.push(
+      context,
+      MaterialPageRoute(
+        settings: const RouteSettings(name: '/incoming_call'),
+        builder: (context) => IncomingCallPage(
+          displayName: currentDisplayName ?? currentPhoneNumber!,
+          phoneNumber: currentPhoneNumber!,
+          thumbnail: currentThumbnail,
+        ),
+      ),
+    ).then((_) {
+      _isCallPageVisible = false;
+      _isNavigating = false;
+      print(
+          'CallService: IncomingCallPage popped, _isCallPageVisible set to false');
+    });
+    _isCallPageVisible = true;
+  }
+
+  void _closeCallPage() {
+    final context = navigatorKey.currentContext;
+    if (context == null) {
+      print('CallService: Cannot close page, context is null');
+      return;
+    }
+
+    // Only attempt to close if a call page is actually visible
+    if (!_isCallPageVisible) {
+      print('CallService: Call page already closed');
+      return;
+    }
+
+    print(
+        'CallService: Closing call page, _isCallPageVisible: $_isCallPageVisible, _pendingSimSwitch: ${_pendingSimSwitch != null}, _manualHangupFlag: $_manualHangupFlag');
+    
+    // Use popUntil to ensure we go back to the home page
+    try {
+      Navigator.popUntil(context, (route) => route.isFirst);
+      _isCallPageVisible = false;
+      print('CallService: Used popUntil to return to home page');
+    } catch (e) {
+      print('CallService: Error with popUntil, trying regular pop: $e');
+      if (Navigator.canPop(context)) {
+        Navigator.pop(context);
+        _isCallPageVisible = false;
+        print('CallService: Used regular pop as fallback');
+      } else {
+        print('CallService: No page to pop, setting _isCallPageVisible to false');
+        _isCallPageVisible = false;
+      }
+    }
+    _activeCallNumber = null;
+  }
+
+  Future<Map<String, dynamic>> makeGsmCall(
+    BuildContext context, {
+    required String phoneNumber,
+    String? displayName,
+    Uint8List? thumbnail,
+  }) async {
+    try {
+      // Load default SIM slot from settings
+      final prefs = await SharedPreferences.getInstance();
+      final simSlot = prefs.getInt('default_sim_slot') ?? 0;
+      return await makeGsmCallWithSim(
+        context,
+        phoneNumber: phoneNumber,
+        displayName: displayName,
+        thumbnail: thumbnail,
+        simSlot: simSlot,
+      );
+    } catch (e) {
+      print("CallService: Error making call: $e");
+      ScaffoldMessenger.of(context).showSnackBar(
+        SnackBar(content: Text("Error making call: $e")),
+      );
+      return {"status": "error", "message": e.toString()};
+    }
+  }
+
+  Future<Map<String, dynamic>> makeGsmCallWithSim(
+    BuildContext context, {
+    required String phoneNumber,
+    String? displayName,
+    Uint8List? thumbnail,
+    required int simSlot,
+  }) async {
+    try {
+      if (_activeCallNumber == phoneNumber && _isCallPageVisible) {
+        print('CallService: Call already active for $phoneNumber, skipping');
+        return {
+          "status": "already_active",
+          "message": "Call already in progress"
+        };
+      }
+      currentPhoneNumber = phoneNumber;
+      currentDisplayName = displayName ?? phoneNumber;
+      currentThumbnail = thumbnail;
+      currentSimSlot = simSlot; // Track the SIM slot being used
+      _simStateController.add(simSlot); // Notify UI of SIM change
+      if (displayName == null || thumbnail == null) {
+        await _fetchContactInfo(phoneNumber);
+      }
+      print(
+          'CallService: Making GSM call to $phoneNumber, displayName: $currentDisplayName, simSlot: $simSlot');
+      final result = await _channel.invokeMethod(
+          'makeGsmCall', {"phoneNumber": phoneNumber, "simSlot": simSlot});
+      print('CallService: makeGsmCall result: $result');
+      final resultMap = Map<String, dynamic>.from(result as Map);
+      if (resultMap["status"] != "calling") {
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(content: Text("Failed to initiate call")),
+        );
+      }
+      return resultMap;
+    } catch (e) {
+      print("CallService: Error making call: $e");
+      ScaffoldMessenger.of(context).showSnackBar(
+        SnackBar(content: Text("Error making call: $e")),
+      );
+      return {"status": "error", "message": e.toString()};
+    }
+  }
+
+  // Pending SIM switch data
+  static Map<String, dynamic>? _pendingSimSwitch;
+  static bool _manualHangupFlag = false; // Track if hangup was manual
+
+  // Getter to check if there's a pending SIM switch
+  static bool get hasPendingSimSwitch => _pendingSimSwitch != null;
+  Future<Map<String, dynamic>> hangUpCall(BuildContext context) async {
+    try {
+      print('CallService: ========== HANGUP INITIATED ==========');
+      print('CallService: _pendingSimSwitch: ${_pendingSimSwitch != null}');
+      print('CallService: _manualHangupFlag: $_manualHangupFlag');
+      print('CallService: _isCallPageVisible: $_isCallPageVisible');
+
+      final result = await _channel.invokeMethod('hangUpCall');
+      print('CallService: hangUpCall result: $result');
+      final resultMap = Map<String, dynamic>.from(result as Map);
+
+      if (resultMap["status"] != "ended") {
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(content: Text("Failed to end call")),
+        );
+      } else {
+        // If hangup was successful, ensure call page closes after a short delay
+        // This is a fallback in case the native call state events don't fire properly
+        Future.delayed(const Duration(milliseconds: 1500), () {
+          if (_isCallPageVisible) {
+            print(
+                'CallService: FALLBACK - Force closing call page after hangup');
+            _closeCallPage();
+            _manualHangupFlag = false; // Reset flag
+          }
+        });
+      }
+
+      return resultMap;
+    } catch (e) {
+      print("CallService: Error hanging up call: $e");
+      ScaffoldMessenger.of(context).showSnackBar(
+        SnackBar(content: Text("Error hanging up call: $e")),
+      );
+      return {"status": "error", "message": e.toString()};
+    }
+  }
+
+  Future<void> switchSimAndRedial({
+    required String phoneNumber,
+    required String displayName,
+    required int simSlot,
+    Uint8List? thumbnail,
+  }) async {
+    try {
+      print(
+          'CallService: Starting SIM switch to slot $simSlot for $phoneNumber');
+
+      // Store the redial information for after hangup
+      _pendingSimSwitch = {
+        'phoneNumber': phoneNumber,
+        'displayName': displayName,
+        'simSlot': simSlot,
+        'thumbnail': thumbnail,
+      };
+
+      // Hang up the current call - this will trigger the disconnected state
+      await _channel.invokeMethod('hangUpCall');
+      print(
+          'CallService: Hangup initiated, waiting for disconnection to complete redial');
+    } catch (e) {
+      print('CallService: Error during SIM switch: $e');
+      _pendingSimSwitch = null;
+      rethrow;
+    }
+  }
+
+  void _handlePendingSimSwitch() async {
+    if (_pendingSimSwitch == null) return;
+
+    final switchData = _pendingSimSwitch!;
+    _pendingSimSwitch = null;
+
+    try {
+      print('CallService: Executing pending SIM switch redial');
+
+      // Wait a moment to ensure the previous call is fully disconnected
+      await Future.delayed(const Duration(
+          milliseconds: 1000)); // Store the new call info for the redial
+      currentPhoneNumber = switchData['phoneNumber'];
+      currentDisplayName = switchData['displayName'];
+      currentThumbnail = switchData['thumbnail'];
+      currentSimSlot = switchData['simSlot']; // Track the new SIM slot
+      _simStateController.add(switchData['simSlot']); // Notify UI of SIM change
+
+      // Make the new call with the selected SIM
+      final result = await _channel.invokeMethod('makeGsmCall', {
+        'phoneNumber': switchData['phoneNumber'],
+        'simSlot': switchData['simSlot'],
+      });
+
+      print('CallService: SIM switch redial result: $result');
+
+      // Show success feedback
+      final context = navigatorKey.currentContext;
+      if (context != null) {
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(
+            content: Text(
+                'Switched to SIM ${switchData['simSlot'] + 1} and redialing...'),
+            backgroundColor: Colors.green,
+          ),
+        );
+      }
+    } catch (e) {
+      print('CallService: Error during SIM switch redial: $e');
+
+      // Show error feedback and close the call page
+      final context = navigatorKey.currentContext;
+      if (context != null) {
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(
+            content: Text('Failed to redial with new SIM: $e'),
+            backgroundColor: Colors.red,
+          ),
+        );
+        // Close the call page since redial failed
+        _closeCallPage();
+      }
+    }
+  }
+}

dialer/lib/domain/services/contact_service.dart

@@ -0,0 +1,86 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_contacts/flutter_contacts.dart';
+import 'package:qr_flutter/qr_flutter.dart';
+
+class ContactService {
+  Future<List<Contact>> fetchContacts() async {
+    if (await FlutterContacts.requestPermission()) {
+      List<Contact> contacts = await FlutterContacts.getContacts(
+        withProperties: true,
+        withThumbnail: true,
+      );
+      return contacts;
+    } else {
+      // Permission denied
+      return [];
+    }
+  }
+
+  Future<List<Contact>> fetchFavoriteContacts() async {
+    if (await FlutterContacts.requestPermission()) {
+      // Get all contacts and filter for favorites
+      List<Contact> allContacts = await FlutterContacts.getContacts(
+        withProperties: true,
+        withThumbnail: true,
+      );
+      return allContacts.where((c) => c.isStarred).toList();
+    } else {
+      // Permission denied
+      return [];
+    }
+  }
+
+  Future<Contact?> addNewContact(Contact contact) async {
+    if (await FlutterContacts.requestPermission()) {
+      try {
+        return await FlutterContacts.insertContact(contact);
+      } catch (e) {
+        debugPrint('Error adding contact: $e');
+        return null;
+      }
+    }
+    return null;
+  }
+
+  void showContactQRCodeDialog(BuildContext context, Contact contact) {
+    final String vCard = contact.toVCard();
+
+    showDialog(
+      context: context,
+      builder: (BuildContext context) {
+        return AlertDialog(
+          backgroundColor: Colors.grey[900],
+          title: Text(
+            'QR Code for ${contact.displayName}',
+            style: const TextStyle(color: Colors.white),
+          ),
+          content: Column(
+            mainAxisSize: MainAxisSize.min,
+            children: [
+              Container(
+                color: Colors.white,
+                padding: const EdgeInsets.all(16.0),
+                child: QrImageView(
+                  data: vCard,
+                  version: QrVersions.auto,
+                  size: 200.0,
+                ),
+              ),
+              const SizedBox(height: 16.0),
+              const Text(
+                'Scan this code to add this contact',
+                style: TextStyle(color: Colors.white70),
+              ),
+            ],
+          ),
+          actions: [
+            TextButton(
+              onPressed: () => Navigator.of(context).pop(),
+              child: const Text('Close'),
+            ),
+          ],
+        );
+      },
+    );
+  }
+}

dialer/lib/domain/services/cryptography/asymmetric_crypto_service.dart

@@ -10,7 +10,7 @@ class AsymmetricCryptoService {
   final String _aliasPrefix = 'icing_';
   final Uuid _uuid = Uuid();
 
-  /// Generates an ECDSA P-256 key pair with a unique alias and stores its metadata.
+  /// Generates an ED25519 key pair with a unique alias and stores its metadata.
   Future<String> generateKeyPair({String? label}) async {
     try {
       // Generate a unique identifier for the key

dialer/lib/domain/services/obfuscate_service.dart

@@ -1,7 +1,7 @@
 // lib/services/obfuscate_service.dart
-import 'package:dialer/widgets/color_darkener.dart';
+import 'package:dialer/presentation/common/widgets/color_darkener.dart';
 
-import '../../globals.dart' as globals;
+import '../../core/config/app_config.dart';
 import 'dart:ui';
 import 'dart:typed_data';
 import 'package:flutter/material.dart';
@@ -20,7 +20,7 @@ class ObfuscateService {
 
   // Public method to obfuscate data
   String obfuscateData(String data) {
-    if (globals.isStealthMode) {
+    if (AppConfig.isStealthMode) {
       return _obfuscateData(data);
     } else {
       return data;
@@ -61,7 +61,7 @@ class ObfuscatedAvatar extends StatelessWidget {
     if (imageBytes != null && imageBytes!.isNotEmpty) {
       return ClipOval(
         child: ImageFiltered(
-          imageFilter: globals.isStealthMode
+          imageFilter: AppConfig.isStealthMode
               ? ImageFilter.blur(sigmaX: 10, sigmaY: 10)
               : ImageFilter.blur(sigmaX: 0, sigmaY: 0),
           child: Image.memory(

dialer/lib/domain/services/qr/qr_scanner.dart

@@ -0,0 +1,57 @@
+import 'package:flutter/material.dart';
+import 'package:mobile_scanner/mobile_scanner.dart';
+
+class QRCodeScannerScreen extends StatefulWidget {
+  const QRCodeScannerScreen({super.key});
+
+  @override
+  _QRCodeScannerScreenState createState() => _QRCodeScannerScreenState();
+}
+
+class _QRCodeScannerScreenState extends State<QRCodeScannerScreen> {
+  MobileScannerController cameraController = MobileScannerController();
+  bool _flashEnabled = false;
+
+  @override
+  void dispose() {
+    cameraController.dispose();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: AppBar(
+        title: const Text('Scan QR Code'),
+        actions: [
+          IconButton(
+            icon: Icon(_flashEnabled ? Icons.flash_on : Icons.flash_off),
+            onPressed: () {
+              setState(() {
+                _flashEnabled = !_flashEnabled;
+                cameraController.toggleTorch();
+              });
+            },
+          ),
+          IconButton(
+            icon: const Icon(Icons.flip_camera_ios),
+            onPressed: () => cameraController.switchCamera(),
+          ),
+        ],
+      ),
+      body: MobileScanner(
+        controller: cameraController,
+        onDetect: (capture) {
+          final List<Barcode> barcodes = capture.barcodes;
+          if (barcodes.isNotEmpty) {
+            // Return the first barcode value
+            final String? code = barcodes.first.rawValue;
+            if (code != null) {
+              Navigator.pop(context, code);
+            }
+          }
+        },
+      ),
+    );
+  }
+}

dialer/lib/features/accessibility/accessibility.dart

@@ -1,459 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:shared_preferences/shared_preferences.dart';
-
-class AccessibilityPage extends StatefulWidget {
-  const AccessibilityPage({Key? key}) : super(key: key);
-
-  @override
-  _AccessibilityPageState createState() => _AccessibilityPageState();
-}
-
-class _AccessibilityPageState extends State<AccessibilityPage> {
-  // Font size setting
-  double _fontSize = 1.0;
-  
-  // Toggle settings
-  bool _highContrastMode = false;
-  bool _reduceAnimations = false;
-  bool _enableVibration = true;
-  bool _enableScreenReader = false;
-  bool _useSimpleLayout = false;
-  bool _autoAnswerCalls = false;
-
-  // Call display timeout
-  int _callDisplayTimeout = 30; // seconds
-  
-  bool _isLoading = true;
-
-  @override
-  void initState() {
-    super.initState();
-    _loadSettings();
-  }
-
-  Future<void> _loadSettings() async {
-    final prefs = await SharedPreferences.getInstance();
-    
-    setState(() {
-      _fontSize = prefs.getDouble('accessibility_font_size') ?? 1.0;
-      _highContrastMode = prefs.getBool('accessibility_high_contrast') ?? false;
-      _reduceAnimations = prefs.getBool('accessibility_reduce_animations') ?? false;
-      _enableVibration = prefs.getBool('accessibility_vibration') ?? true;
-      _enableScreenReader = prefs.getBool('accessibility_screen_reader') ?? false;
-      _useSimpleLayout = prefs.getBool('accessibility_simple_layout') ?? false;
-      _autoAnswerCalls = prefs.getBool('accessibility_auto_answer') ?? false;
-      _callDisplayTimeout = prefs.getInt('accessibility_call_timeout') ?? 30;
-      _isLoading = false;
-    });
-  }
-
-  Future<void> _saveSettings() async {
-    final prefs = await SharedPreferences.getInstance();
-    
-    await prefs.setDouble('accessibility_font_size', _fontSize);
-    await prefs.setBool('accessibility_high_contrast', _highContrastMode);
-    await prefs.setBool('accessibility_reduce_animations', _reduceAnimations);
-    await prefs.setBool('accessibility_vibration', _enableVibration);
-    await prefs.setBool('accessibility_screen_reader', _enableScreenReader);
-    await prefs.setBool('accessibility_simple_layout', _useSimpleLayout);
-    await prefs.setBool('accessibility_auto_answer', _autoAnswerCalls);
-    await prefs.setInt('accessibility_call_timeout', _callDisplayTimeout);
-    
-    ScaffoldMessenger.of(context).showSnackBar(
-      const SnackBar(content: Text('Accessibility settings saved')),
-    );
-  }
-
-  String _getFontSizeLabel() {
-    if (_fontSize <= 0.8) return 'Small';
-    if (_fontSize <= 1.0) return 'Default';
-    if (_fontSize <= 1.2) return 'Large';
-    if (_fontSize <= 1.4) return 'Extra Large';
-    return 'Maximum';
-  }
-
-  String _getCallTimeoutLabel() {
-    if (_callDisplayTimeout <= 15) return '15 seconds';
-    if (_callDisplayTimeout <= 30) return '30 seconds';
-    if (_callDisplayTimeout <= 45) return '45 seconds';
-    if (_callDisplayTimeout <= 60) return '1 minute';
-    return '${_callDisplayTimeout} seconds';
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return Scaffold(
-      backgroundColor: Colors.black,
-      appBar: AppBar(
-        title: const Text('Accessibility'),
-        backgroundColor: Colors.black,
-        elevation: 0,
-        actions: [
-          TextButton(
-            onPressed: _saveSettings,
-            child: const Text('Save', style: TextStyle(color: Colors.blue)),
-          ),
-        ],
-      ),
-      body: _isLoading 
-        ? const Center(child: CircularProgressIndicator())
-        : SingleChildScrollView(
-            padding: const EdgeInsets.all(20.0),
-            child: Column(
-              crossAxisAlignment: CrossAxisAlignment.start,
-              children: [
-                // Header with icon
-                Center(
-                  child: Column(
-                    children: [
-                      Container(
-                        width: 80,
-                        height: 80,
-                        decoration: BoxDecoration(
-                          color: Colors.blue,
-                          borderRadius: BorderRadius.circular(20),
-                        ),
-                        child: const Icon(
-                          Icons.accessibility_new,
-                          size: 50,
-                          color: Colors.white,
-                        ),
-                      ),
-                      const SizedBox(height: 16),
-                      const Text(
-                        'Accessibility Settings',
-                        style: TextStyle(
-                          fontSize: 22,
-                          fontWeight: FontWeight.bold,
-                          color: Colors.white,
-                        ),
-                      ),
-                      const SizedBox(height: 8),
-                      Text(
-                        'Customize your experience',
-                        style: TextStyle(
-                          color: Colors.grey[400],
-                          fontSize: 14,
-                        ),
-                      ),
-                    ],
-                  ),
-                ),
-                
-                const SizedBox(height: 32),
-                
-                // Text Size Settings
-                const _SectionHeader(title: 'Display Settings'),
-                _ContentCard(
-                  child: Column(
-                    crossAxisAlignment: CrossAxisAlignment.start,
-                    children: [
-                      Row(
-                        mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                        children: [
-                          const Text(
-                            'Text Size',
-                            style: TextStyle(color: Colors.white, fontSize: 16),
-                          ),
-                          Text(
-                            _getFontSizeLabel(),
-                            style: TextStyle(color: Colors.blue, fontSize: 16),
-                          ),
-                        ],
-                      ),
-                      const SizedBox(height: 8),
-                      Slider(
-                        value: _fontSize,
-                        min: 0.8,
-                        max: 1.6,
-                        divisions: 4,
-                        label: _getFontSizeLabel(),
-                        onChanged: (value) {
-                          setState(() {
-                            _fontSize = value;
-                          });
-                        },
-                      ),
-                      const SizedBox(height: 16),
-                      _ToggleOption(
-                        title: 'High Contrast Mode',
-                        subtitle: 'Increase color contrast for better visibility',
-                        value: _highContrastMode,
-                        onChanged: (value) {
-                          setState(() {
-                            _highContrastMode = value;
-                          });
-                        },
-                      ),
-                      _ToggleOption(
-                        title: 'Reduce Animations',
-                        subtitle: 'Minimize motion effects throughout the app',
-                        value: _reduceAnimations,
-                        onChanged: (value) {
-                          setState(() {
-                            _reduceAnimations = value;
-                          });
-                        },
-                      ),
-                      _ToggleOption(
-                        title: 'Simple Layout',
-                        subtitle: 'Use a simplified interface with larger touch targets',
-                        value: _useSimpleLayout,
-                        onChanged: (value) {
-                          setState(() {
-                            _useSimpleLayout = value;
-                          });
-                        },
-                      ),
-                    ],
-                  ),
-                ),
-                
-                const SizedBox(height: 24),
-                
-                // Assistive Technology
-                const _SectionHeader(title: 'Assistive Technology'),
-                _ContentCard(
-                  child: Column(
-                    crossAxisAlignment: CrossAxisAlignment.start,
-                    children: [
-                      _ToggleOption(
-                        title: 'Enable Screen Reader',
-                        subtitle: 'Works with TalkBack and VoiceOver',
-                        value: _enableScreenReader,
-                        onChanged: (value) {
-                          setState(() {
-                            _enableScreenReader = value;
-                          });
-                        },
-                      ),
-                      _ToggleOption(
-                        title: 'Haptic Feedback',
-                        subtitle: 'Vibration feedback for interactions',
-                        value: _enableVibration,
-                        onChanged: (value) {
-                          setState(() {
-                            _enableVibration = value;
-                          });
-                        },
-                      ),
-                    ],
-                  ),
-                ),
-                
-                const SizedBox(height: 24),
-                
-                // Call Settings
-                const _SectionHeader(title: 'Call Settings'),
-                _ContentCard(
-                  child: Column(
-                    crossAxisAlignment: CrossAxisAlignment.start,
-                    children: [
-                      _ToggleOption(
-                        title: 'Auto-Answer Calls',
-                        subtitle: 'Answer incoming calls automatically after timeout',
-                        value: _autoAnswerCalls,
-                        onChanged: (value) {
-                          setState(() {
-                            _autoAnswerCalls = value;
-                          });
-                        },
-                      ),
-                      const SizedBox(height: 16),
-                      Row(
-                        mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                        children: [
-                          const Text(
-                            'Call Display Timeout',
-                            style: TextStyle(color: Colors.white, fontSize: 16),
-                          ),
-                          Text(
-                            _getCallTimeoutLabel(),
-                            style: TextStyle(color: Colors.blue, fontSize: 16),
-                          ),
-                        ],
-                      ),
-                      const SizedBox(height: 8),
-                      Slider(
-                        value: _callDisplayTimeout.toDouble(),
-                        min: 15,
-                        max: 60,
-                        divisions: 3,
-                        label: _getCallTimeoutLabel(),
-                        onChanged: (value) {
-                          setState(() {
-                            _callDisplayTimeout = value.toInt();
-                          });
-                        },
-                      ),
-                    ],
-                  ),
-                ),
-                
-                const SizedBox(height: 24),
-                
-                // Additional Resources
-                const _SectionHeader(title: 'Additional Resources'),
-                _ContentCard(
-                  child: Column(
-                    crossAxisAlignment: CrossAxisAlignment.start,
-                    children: [
-                      _LinkButton(
-                        icon: Icons.help_outline,
-                        text: 'Accessibility Help',
-                        onTap: () {
-                          // Add navigation or link to help page
-                        },
-                      ),
-                      const SizedBox(height: 12),
-                      _LinkButton(
-                        icon: Icons.feedback_outlined,
-                        text: 'Send Accessibility Feedback',
-                        onTap: () {
-                          // Add feedback functionality
-                        },
-                      ),
-                    ],
-                  ),
-                ),
-                
-                const SizedBox(height: 40),
-              ],
-            ),
-          ),
-    );
-  }
-}
-
-class _SectionHeader extends StatelessWidget {
-  final String title;
-  
-  const _SectionHeader({Key? key, required this.title}) : super(key: key);
-
-  @override
-  Widget build(BuildContext context) {
-    return Padding(
-      padding: const EdgeInsets.only(bottom: 8.0),
-      child: Text(
-        title,
-        style: const TextStyle(
-          color: Colors.blue,
-          fontSize: 18,
-          fontWeight: FontWeight.bold,
-        ),
-      ),
-    );
-  }
-}
-
-class _ContentCard extends StatelessWidget {
-  final Widget child;
-  
-  const _ContentCard({Key? key, required this.child}) : super(key: key);
-
-  @override
-  Widget build(BuildContext context) {
-    return Container(
-      width: double.infinity,
-      padding: const EdgeInsets.all(16),
-      decoration: BoxDecoration(
-        color: Colors.grey[900],
-        borderRadius: BorderRadius.circular(12),
-      ),
-      child: child,
-    );
-  }
-}
-
-class _ToggleOption extends StatelessWidget {
-  final String title;
-  final String subtitle;
-  final bool value;
-  final ValueChanged<bool> onChanged;
-  
-  const _ToggleOption({
-    Key? key,
-    required this.title,
-    required this.subtitle,
-    required this.value,
-    required this.onChanged,
-  }) : super(key: key);
-
-  @override
-  Widget build(BuildContext context) {
-    return Padding(
-      padding: const EdgeInsets.symmetric(vertical: 8.0),
-      child: Row(
-        children: [
-          Expanded(
-            child: Column(
-              crossAxisAlignment: CrossAxisAlignment.start,
-              children: [
-                Text(
-                  title,
-                  style: const TextStyle(
-                    color: Colors.white,
-                    fontSize: 16,
-                  ),
-                ),
-                const SizedBox(height: 4),
-                Text(
-                  subtitle,
-                  style: const TextStyle(
-                    color: Colors.white70,
-                    fontSize: 14,
-                  ),
-                ),
-              ],
-            ),
-          ),
-          Switch(
-            value: value,
-            onChanged: onChanged,
-            activeColor: Colors.blue,
-          ),
-        ],
-      ),
-    );
-  }
-}
-
-class _LinkButton extends StatelessWidget {
-  final IconData icon;
-  final String text;
-  final VoidCallback onTap;
-  
-  const _LinkButton({
-    Key? key,
-    required this.icon,
-    required this.text,
-    required this.onTap,
-  }) : super(key: key);
-
-  @override
-  Widget build(BuildContext context) {
-    return InkWell(
-      onTap: onTap,
-      borderRadius: BorderRadius.circular(8),
-      child: Padding(
-        padding: const EdgeInsets.symmetric(vertical: 8.0),
-        child: Row(
-          children: [
-            Icon(icon, color: Colors.blue),
-            const SizedBox(width: 16),
-            Text(
-              text,
-              style: const TextStyle(color: Colors.white),
-            ),
-            const Spacer(),
-            const Icon(
-              Icons.arrow_forward_ios,
-              color: Colors.white70,
-              size: 16,
-            ),
-          ],
-        ),
-      ),
-    );
-  }
-}

dialer/lib/features/call/call_page.dart

@@ -1,332 +0,0 @@
-import 'dart:typed_data';
-import 'package:flutter/material.dart';
-import 'package:dialer/services/obfuscate_service.dart';
-import 'package:dialer/widgets/username_color_generator.dart';
-
-class CallPage extends StatefulWidget {
-  final String displayName;
-  final Uint8List? thumbnail;
-
-  const CallPage({super.key, required this.displayName, this.thumbnail});
-
-  @override
-  _CallPageState createState() => _CallPageState();
-}
-
-class _CallPageState extends State<CallPage> {
-  final ObfuscateService _obfuscateService = ObfuscateService();
-  bool isMuted = false;
-  bool isSpeakerOn = false;
-  bool isKeypadVisible = false;
-  bool icingProtocolOk = true;
-  String _typedDigits = ""; // New state variable for pressed digits
-
-  void _addDigit(String digit) {
-    setState(() {
-      _typedDigits += digit;
-    });
-  }
-
-  void _toggleMute() {
-    setState(() {
-      isMuted = !isMuted;
-    });
-  }
-
-  void _toggleSpeaker() {
-    setState(() {
-      isSpeakerOn = !isSpeakerOn;
-    });
-  }
-
-  void _toggleKeypad() {
-    setState(() {
-      isKeypadVisible = !isKeypadVisible;
-    });
-  }
-
-  void _toggleIcingProtocol() {
-    setState(() {
-      icingProtocolOk = !icingProtocolOk;
-    });
-  }
-
-  void _hangUp() {
-    Navigator.pop(context);
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    final double avatarRadius = isKeypadVisible ? 45.0 : 45.0; // Smaller avatar
-    final double nameFontSize = isKeypadVisible ? 24.0 : 24.0; // Smaller font
-    final double statusFontSize = isKeypadVisible ? 16.0 : 16.0; // Smaller status
-
-    return Scaffold(
-      body: Container(
-        color: Colors.black,
-        child: SafeArea(
-          child: Column(
-            children: [
-              // Top section - make it more compact
-              Container(
-                padding: const EdgeInsets.symmetric(vertical: 8.0),
-                child: Column(
-                  mainAxisSize: MainAxisSize.min,
-                  children: [
-                    SizedBox(height: 35),
-                    ObfuscatedAvatar(
-                      imageBytes: widget.thumbnail,
-                      radius: avatarRadius,
-                      backgroundColor: generateColorFromName(widget.displayName),
-                      fallbackInitial: widget.displayName,
-                    ),
-                    const SizedBox(height: 4),
-                    Row(
-                      mainAxisAlignment: MainAxisAlignment.center,
-                      children: [
-                        Icon(
-                          icingProtocolOk ? Icons.lock : Icons.lock_open,
-                          color: icingProtocolOk ? Colors.green : Colors.red,
-                          size: 16,
-                        ),
-                        const SizedBox(width: 4),
-                        Text(
-                          'Icing protocol: ${icingProtocolOk ? "ok" : "ko"}',
-                          style: TextStyle(
-                            color: icingProtocolOk ? Colors.green : Colors.red,
-                            fontSize: 12,
-                            fontWeight: FontWeight.bold,
-                          ),
-                        ),
-                      ],
-                    ),
-                    const SizedBox(height: 4),
-                    Text(
-                      _obfuscateService.obfuscateData(widget.displayName),
-                      style: TextStyle(
-                        fontSize: nameFontSize,
-                        color: Colors.white,
-                        fontWeight: FontWeight.bold,
-                      ),
-                    ),
-                    Text(
-                      'Calling...',
-                      style: TextStyle(fontSize: statusFontSize, color: Colors.white70),
-                    ),
-                  ],
-                ),
-              ),
-
-              // Middle section - make it flexible and scrollable if needed
-              Expanded(
-                child: Column(
-                  children: [
-                    if (isKeypadVisible) ...[
-                      // Add spacer to push keypad down
-                      const Spacer(flex: 2),
-                      
-                      // Typed digits display
-                      Padding(
-                        padding: const EdgeInsets.symmetric(horizontal: 20.0),
-                        child: Row(
-                          mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                          children: [
-                            Expanded(
-                              child: Text(
-                                _typedDigits,
-                                maxLines: 1,
-                                textAlign: TextAlign.right,
-                                overflow: TextOverflow.ellipsis,
-                                style: const TextStyle(
-                                  fontSize: 24,
-                                  color: Colors.white,
-                                  fontWeight: FontWeight.bold,
-                                ),
-                              ),
-                            ),
-                            IconButton(
-                              padding: EdgeInsets.zero,
-                              onPressed: _toggleKeypad,
-                              icon: const Icon(Icons.close, color: Colors.white),
-                            ),
-                          ],
-                        ),
-                      ),
-                      
-                      // Keypad grid
-                      Container(
-                        height: MediaQuery.of(context).size.height * 0.35,
-                        margin: const EdgeInsets.symmetric(horizontal: 20),
-                        child: GridView.count(
-                          shrinkWrap: true,
-                          physics: const NeverScrollableScrollPhysics(),
-                          crossAxisCount: 3,
-                          childAspectRatio: 1.3,
-                          mainAxisSpacing: 8,
-                          crossAxisSpacing: 8,
-                          children: List.generate(12, (index) {
-                            String label;
-                            if (index < 9) {
-                              label = '${index + 1}';
-                            } else if (index == 9) {
-                              label = '*';
-                            } else if (index == 10) {
-                              label = '0';
-                            } else {
-                              label = '#';
-                            }
-                            return GestureDetector(
-                              onTap: () => _addDigit(label),
-                              child: Container(
-                                decoration: const BoxDecoration(
-                                  shape: BoxShape.circle,
-                                  color: Colors.transparent,
-                                ),
-                                child: Center(
-                                  child: Text(
-                                    label,
-                                    style: const TextStyle(fontSize: 32, color: Colors.white),
-                                  ),
-                                ),
-                              ),
-                            );
-                          }),
-                        ),
-                      ),
-                      
-                      // Add spacer after keypad
-                      const Spacer(flex: 1),
-                    ] else ...[
-                      const Spacer(),
-                      // Control buttons
-                      Padding(
-                        padding: const EdgeInsets.symmetric(horizontal: 32.0),
-                        child: Column(
-                          mainAxisSize: MainAxisSize.min,
-                          children: [
-                            // Main control buttons
-                            Row(
-                              mainAxisAlignment: MainAxisAlignment.spaceEvenly,
-                              children: [
-                                // Mute
-                                Column(
-                                  mainAxisSize: MainAxisSize.min,
-                                  children: [
-                                    IconButton(
-                                      onPressed: _toggleMute,
-                                      icon: Icon(
-                                        isMuted ? Icons.mic_off : Icons.mic,
-                                        color: Colors.white,
-                                        size: 32,
-                                      ),
-                                    ),
-                                    Text(
-                                      isMuted ? 'Unmute' : 'Mute',
-                                      style: const TextStyle(color: Colors.white, fontSize: 14),
-                                    ),
-                                  ],
-                                ),
-                                // Keypad
-                                Column(
-                                  mainAxisSize: MainAxisSize.min,
-                                  children: [
-                                    IconButton(
-                                      onPressed: _toggleKeypad,
-                                      icon: const Icon(Icons.dialpad, color: Colors.white, size: 32),
-                                    ),
-                                    const Text(
-                                      'Keypad',
-                                      style: TextStyle(color: Colors.white, fontSize: 14),
-                                    ),
-                                  ],
-                                ),
-                                // Speaker
-                                Column(
-                                  mainAxisSize: MainAxisSize.min,
-                                  children: [
-                                    IconButton(
-                                      onPressed: _toggleSpeaker,
-                                      icon: Icon(
-                                        isSpeakerOn ? Icons.volume_up : Icons.volume_off,
-                                        color: isSpeakerOn ? Colors.amber : Colors.white,
-                                        size: 32,
-                                      ),
-                                    ),
-                                    const Text(
-                                      'Speaker',
-                                      style: TextStyle(color: Colors.white, fontSize: 14),
-                                    ),
-                                  ],
-                                ),
-                              ],
-                            ),
-                            const SizedBox(height: 20),
-                            // Additional buttons
-                            Row(
-                              mainAxisAlignment: MainAxisAlignment.spaceEvenly,
-                              children: [
-                                // Add Contact
-                                Column(
-                                  mainAxisSize: MainAxisSize.min,
-                                  children: [
-                                    IconButton(
-                                      onPressed: () {
-                                        // ...existing code...
-                                      },
-                                      icon: const Icon(Icons.person_add, color: Colors.white, size: 32),
-                                    ),
-                                    const Text('Add Contact',
-                                        style: TextStyle(color: Colors.white, fontSize: 14)),
-                                  ],
-                                ),
-                                // Change SIM
-                                Column(
-                                  mainAxisSize: MainAxisSize.min,
-                                  children: [
-                                    IconButton(
-                                      onPressed: () {
-                                        // ...existing code...
-                                      },
-                                      icon: const Icon(Icons.sim_card, color: Colors.white, size: 32),
-                                    ),
-                                    const Text('Change SIM',
-                                        style: TextStyle(color: Colors.white, fontSize: 14)),
-                                  ],
-                                ),
-                              ],
-                            ),
-                          ],
-                        ),
-                      ),
-                      const Spacer(flex: 3),
-                    ],
-                  ],
-                ),
-              ),
-
-              // Bottom section - hang up button
-              Padding(
-                padding: const EdgeInsets.only(bottom: 16.0),
-                child: GestureDetector(
-                  onTap: _hangUp,
-                  child: Container(
-                    padding: const EdgeInsets.all(12),
-                    decoration: const BoxDecoration(
-                      color: Colors.red,
-                      shape: BoxShape.circle,
-                    ),
-                    child: const Icon(
-                      Icons.call_end,
-                      color: Colors.white,
-                      size: 32,
-                    ),
-                  ),
-                ),
-              ),
-            ],
-          ),
-        ),
-      ),
-    );
-  }
-}

dialer/lib/features/composition/composition.dart

@@ -1,296 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_contacts/flutter_contacts.dart';
-import 'package:url_launcher/url_launcher.dart';
-import '../../services/contact_service.dart';
-import '../../services/obfuscate_service.dart'; // Import ObfuscateService
-import '../../services/call_service.dart'; // Import the CallService
-import '../contacts/widgets/add_contact_button.dart';
-
-class CompositionPage extends StatefulWidget {
-  const CompositionPage({super.key});
-
-  @override
-  _CompositionPageState createState() => _CompositionPageState();
-}
-
-class _CompositionPageState extends State<CompositionPage> {
-  String dialedNumber = "";
-  List<Contact> _allContacts = [];
-  List<Contact> _filteredContacts = [];
-  final ContactService _contactService = ContactService();
-
-  // Instantiate the ObfuscateService
-  final ObfuscateService _obfuscateService = ObfuscateService();
-
-  // Instantiate the CallService
-  final CallService _callService = CallService();
-
-  @override
-  void initState() {
-    super.initState();
-    _fetchContacts();
-  }
-
-  Future<void> _fetchContacts() async {
-    _allContacts = await _contactService.fetchContacts();
-    _filteredContacts = _allContacts;
-    setState(() {});
-  }
-
-  void _filterContacts() {
-    setState(() {
-      _filteredContacts = _allContacts.where((contact) {
-        final phoneMatch = contact.phones.any((phone) =>
-            phone.number.replaceAll(RegExp(r'\D'), '').contains(dialedNumber));
-        final nameMatch = contact.displayName
-            .toLowerCase()
-            .contains(dialedNumber.toLowerCase());
-        return phoneMatch || nameMatch;
-      }).toList();
-    });
-  }
-
-  void _onNumberPress(String number) {
-    setState(() {
-      dialedNumber += number;
-      _filterContacts();
-    });
-  }
-
-  void _onDeletePress() {
-    setState(() {
-      if (dialedNumber.isNotEmpty) {
-        dialedNumber = dialedNumber.substring(0, dialedNumber.length - 1);
-        _filterContacts();
-      }
-    });
-  }
-
-  void _onClearPress() {
-    setState(() {
-      dialedNumber = "";
-      _filteredContacts = _allContacts;
-    });
-  }
-
-  // Function to call a contact's number using the CallService
-  void _makeCall(String phoneNumber) async {
-    try {
-      await _callService.makeGsmCall(phoneNumber);
-      setState(() {
-        dialedNumber = phoneNumber;
-      });
-    } catch (e) {
-      debugPrint("Error making call: $e");
-    }
-  }
-
-  // Function to send an SMS to a contact's number
-  void _launchSms(String phoneNumber) async {
-    final uri = Uri(scheme: 'sms', path: phoneNumber);
-    if (await canLaunchUrl(uri)) {
-      await launchUrl(uri);
-    } else {
-      debugPrint('Could not send SMS to $phoneNumber');
-    }
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return Scaffold(
-      backgroundColor: Colors.black,
-      body: Stack(
-        children: [
-          Column(
-            children: [
-              // Top half: Display contacts matching dialed number
-              Expanded(
-                flex: 2,
-                child: Container(
-                  padding: const EdgeInsets.only(
-                      top: 42.0, left: 16.0, right: 16.0, bottom: 16.0),
-                  color: Colors.black,
-                  child: Column(
-                    crossAxisAlignment: CrossAxisAlignment.start,
-                    children: [
-                      Expanded(
-                        child: ListView(
-                          children: _filteredContacts.isNotEmpty
-                              ? _filteredContacts.map((contact) {
-                            final phoneNumber = contact.phones.isNotEmpty
-                                ? contact.phones.first.number
-                                : 'No phone number';
-                            return ListTile(
-                              title: Text(
-                                _obfuscateService.obfuscateData(contact.displayName),
-                                style: const TextStyle(color: Colors.white),
-                              ),
-                              subtitle: Text(
-                                _obfuscateService.obfuscateData(phoneNumber),
-                                style: const TextStyle(color: Colors.grey),
-                              ),
-                              trailing: Row(
-                                mainAxisSize: MainAxisSize.min,
-                                children: [
-                                  // Call button (Now using CallService)
-                                  IconButton(
-                                    icon: Icon(Icons.phone,
-                                        color: Colors.green[300],
-                                        size: 20),
-                                    onPressed: () {
-                                      _makeCall(phoneNumber); // Make a call using CallService
-                                    },
-                                  ),
-                                  // Message button
-                                  IconButton(
-                                    icon: Icon(Icons.message,
-                                        color: Colors.blue[300],
-                                        size: 20),
-                                    onPressed: () {
-                                      _launchSms(phoneNumber);
-                                    },
-                                  ),
-                                ],
-                              ),
-                              onTap: () {
-                                // Handle contact selection if needed
-                              },
-                            );
-                          }).toList()
-                              : [],
-                        ),
-                      ),
-                    ],
-                  ),
-                ),
-              ),
-
-              // Bottom half: Dialpad and Dialed number display with erase button
-              Expanded(
-                flex: 2,
-                child: Container(
-                  padding: const EdgeInsets.symmetric(horizontal: 16.0),
-                  child: Column(
-                    mainAxisAlignment: MainAxisAlignment.start,
-                    children: [
-                      // Display dialed number with erase button
-                      Row(
-                        mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                        children: [
-                          Expanded(
-                            child: Align(
-                              alignment: Alignment.center,
-                              child: Text(
-                                dialedNumber,
-                                style: const TextStyle(
-                                    fontSize: 24, color: Colors.white),
-                                overflow: TextOverflow.ellipsis,
-                              ),
-                            ),
-                          ),
-                          IconButton(
-                            onPressed: _onClearPress,
-                            icon: const Icon(Icons.backspace,
-                                color: Colors.white),
-                          ),
-                        ],
-                      ),
-                      const SizedBox(height: 10),
-
-                      // Dialpad
-                      Expanded(
-                        child: SingleChildScrollView(
-                          child: Column(
-                            mainAxisAlignment: MainAxisAlignment.spaceEvenly,
-                            children: [
-                              Row(
-                                mainAxisAlignment:
-                                MainAxisAlignment.spaceEvenly,
-                                children: [
-                                  _buildDialButton('1'),
-                                  _buildDialButton('2'),
-                                  _buildDialButton('3'),
-                                ],
-                              ),
-                              Row(
-                                mainAxisAlignment:
-                                MainAxisAlignment.spaceEvenly,
-                                children: [
-                                  _buildDialButton('4'),
-                                  _buildDialButton('5'),
-                                  _buildDialButton('6'),
-                                ],
-                              ),
-                              Row(
-                                mainAxisAlignment:
-                                MainAxisAlignment.spaceEvenly,
-                                children: [
-                                  _buildDialButton('7'),
-                                  _buildDialButton('8'),
-                                  _buildDialButton('9'),
-                                ],
-                              ),
-                              Row(
-                                mainAxisAlignment:
-                                MainAxisAlignment.spaceEvenly,
-                                children: [
-                                  _buildDialButton('*'),
-                                  _buildDialButton('0'),
-                                  _buildDialButton('#'),
-                                ],
-                              ),
-                            ],
-                          ),
-                        ),
-                      ),
-                    ],
-                  ),
-                ),
-              ),
-            ],
-          ),
-
-          // Add Contact Button
-          Positioned(
-            bottom: 20.0,
-            left: 0,
-            right: 0,
-            child: Center(
-              child: AddContactButton(),
-            ),
-          ),
-
-          // Top Row with Back Arrow
-          Positioned(
-            top: 40.0,
-            left: 16.0,
-            child: IconButton(
-              icon: const Icon(Icons.arrow_back, color: Colors.white),
-              onPressed: () {
-                Navigator.pop(context);
-              },
-            ),
-          ),
-        ],
-      ),
-    );
-  }
-
-  Widget _buildDialButton(String number) {
-    return ElevatedButton(
-      onPressed: () => _onNumberPress(number),
-      style: ElevatedButton.styleFrom(
-        backgroundColor: Colors.black,
-        shape: const CircleBorder(),
-        padding: const EdgeInsets.all(16),
-      ),
-      child: Text(
-        number,
-        style: const TextStyle(
-          fontSize: 24,
-          color: Colors.white,
-        ),
-      ),
-    );
-  }
-}

dialer/lib/features/contacts/contact_page.dart

@@ -1,26 +0,0 @@
-import 'package:dialer/features/contacts/contact_state.dart';
-import 'package:dialer/features/contacts/widgets/alphabet_scroll_page.dart';
-import 'package:flutter/material.dart';
-import 'package:dialer/widgets/loading_indicator.dart';
-
-class ContactPage extends StatefulWidget {
-  const ContactPage({super.key});
-
-  @override
-  _ContactPageState createState() => _ContactPageState();
-}
-
-class _ContactPageState extends State<ContactPage> {
-  @override
-  Widget build(BuildContext context) {
-    final contactState = ContactState.of(context);
-    return Scaffold(
-      body: contactState.loading
-          ? const LoadingIndicatorWidget()
-          : AlphabetScrollPage(
-              scrollOffset: contactState.scrollOffset,
-              contacts: contactState.contacts, // Use all contacts here
-            ),
-    );
-  }
-}

dialer/lib/features/contacts/widgets/alphabet_scroll_page.dart

@@ -1,217 +0,0 @@
-import 'package:dialer/services/obfuscate_service.dart';
-import 'package:dialer/widgets/username_color_generator.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_contacts/flutter_contacts.dart';
-import '../contact_state.dart';
-import 'add_contact_button.dart';
-import 'contact_modal.dart';
-import 'share_own_qr.dart';
-
-class AlphabetScrollPage extends StatefulWidget {
-  final double scrollOffset;
-  final List<Contact> contacts;
-
-  const AlphabetScrollPage({
-    super.key,
-    required this.scrollOffset,
-    required this.contacts,
-  });
-
-  @override
-  _AlphabetScrollPageState createState() => _AlphabetScrollPageState();
-}
-
-class _AlphabetScrollPageState extends State<AlphabetScrollPage> {
-  late ScrollController _scrollController;
-
-  final ObfuscateService _obfuscateService = ObfuscateService();
-
-  @override
-  void initState() {
-    super.initState();
-    _scrollController = ScrollController(initialScrollOffset: widget.scrollOffset);
-    _scrollController.addListener(_onScroll);
-  }
-
-  void _onScroll() {
-    final contactState = ContactState.of(context);
-    contactState.setScrollOffset(_scrollController.offset);
-  }
-
-  Future<void> _refreshContacts() async {
-    final contactState = ContactState.of(context);
-    try {
-      await contactState.fetchContacts();
-    } catch (e) {
-      print('Error refreshing contacts: $e');
-      ScaffoldMessenger.of(context).showSnackBar(
-        SnackBar(content: Text('Failed to refresh contacts')),
-      );
-    }
-  }
-
-  void _toggleFavorite(Contact contact) async {
-    try {
-      if (await FlutterContacts.requestPermission()) {
-        Contact? fullContact = await FlutterContacts.getContact(contact.id,
-            withProperties: true,
-            withAccounts: true,
-            withPhoto: true,
-            withThumbnail: true);
-
-        if (fullContact != null) {
-          fullContact.isStarred = !fullContact.isStarred;
-          await FlutterContacts.updateContact(fullContact);
-        }
-        await _refreshContacts();
-      } else {
-        print("Could not fetch contact details");
-      }
-    } catch (e) {
-      print("Error updating favorite status: $e");
-      ScaffoldMessenger.of(context).showSnackBar(
-        SnackBar(content: Text('Failed to update contact favorite status')),
-      );
-    }
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    final contacts = widget.contacts;
-    final selfContact = ContactState.of(context).selfContact;
-
-    Map<String, List<Contact>> alphabetizedContacts = {};
-    for (var contact in contacts) {
-      String firstLetter = contact.displayName.isNotEmpty
-          ? contact.displayName[0].toUpperCase()
-          : '#';
-      if (!alphabetizedContacts.containsKey(firstLetter)) {
-        alphabetizedContacts[firstLetter] = [];
-      }
-      alphabetizedContacts[firstLetter]!.add(contact);
-    }
-
-    List<String> alphabetKeys = alphabetizedContacts.keys.toList()..sort();
-
-    return Scaffold(
-      backgroundColor: Colors.black,
-      body: Column(
-        children: [
-          // Top buttons row
-          Container(
-            color: Colors.black,
-            padding: const EdgeInsets.symmetric(horizontal: 16.0, vertical: 8.0),
-            child: Row(
-              mainAxisAlignment: MainAxisAlignment.spaceBetween,
-              children: [
-                AddContactButton(),
-                QRCodeButton(contacts: contacts, selfContact: selfContact),
-              ],
-            ),
-          ),
-          // Contact List
-          Expanded(
-            child: ListView.builder(
-              controller: _scrollController,
-              itemCount: alphabetKeys.length,
-              itemBuilder: (context, index) {
-                String letter = alphabetKeys[index];
-                List<Contact> contactsForLetter = alphabetizedContacts[letter]!;
-                return Column(
-                  crossAxisAlignment: CrossAxisAlignment.start,
-                  children: [
-                    // Alphabet Letter Header
-                    Padding(
-                      padding: const EdgeInsets.symmetric(
-                          vertical: 8.0, horizontal: 16.0),
-                      child: Text(
-                        letter,
-                        style: const TextStyle(
-                          fontSize: 28,
-                          fontWeight: FontWeight.bold,
-                          color: Colors.white,
-                        ),
-                      ),
-                    ),
-                    // Contact Entries
-                    ...contactsForLetter.map((contact) {
-                      String phoneNumber = contact.phones.isNotEmpty
-                          ? _obfuscateService.obfuscateData(contact.phones.first.number)
-                          : 'No phone number';
-                      Color avatarColor =
-                      generateColorFromName(contact.displayName);
-                      return ListTile(
-                        leading: ObfuscatedAvatar(
-                          imageBytes: contact.thumbnail,
-                          radius: 25,
-                          backgroundColor: avatarColor,
-                          fallbackInitial: contact.displayName,
-                        ),
-                        title: Text(
-                          _obfuscateService.obfuscateData(contact.displayName),
-                          style: const TextStyle(color: Colors.white),
-                        ),
-                        subtitle: Text(
-                          phoneNumber,
-                          style: const TextStyle(color: Colors.white70),
-                        ),
-                        onTap: () {
-                          showModalBottomSheet(
-                            context: context,
-                            isScrollControlled: true,
-                            backgroundColor: Colors.transparent,
-                            builder: (context) {
-                              return ContactModal(
-                                contact: contact,
-                                onEdit: () async {
-                                  if (await FlutterContacts.requestPermission()) {
-                                    final updatedContact =
-                                    await FlutterContacts.openExternalEdit(
-                                        contact.id);
-                                    if (updatedContact != null) {
-                                      await _refreshContacts();
-                                      Navigator.of(context).pop();
-                                      ScaffoldMessenger.of(context)
-                                          .showSnackBar(
-                                        SnackBar(
-                                          content: Text(
-                                              '${contact.displayName} updated successfully!'),
-                                        ),
-                                      );
-                                    } else {
-                                      ScaffoldMessenger.of(context)
-                                          .showSnackBar(
-                                        SnackBar(
-                                          content:
-                                          Text('Edit canceled or failed.'),
-                                        ),
-                                      );
-                                    }
-                                  }
-                                },
-                                onToggleFavorite: () {
-                                  _toggleFavorite(contact);
-                                },
-                                isFavorite: contact.isStarred,
-                              );
-                            },
-                          );
-                        },
-                      );
-                    }),
-                  ],
-                );
-              },
-            ),
-          ),
-        ],
-      ),
-    );
-  }
-
-  @override
-  void dispose() {
-    _scrollController.dispose();
-    super.dispose();
-  }
-}

dialer/lib/features/contacts/widgets/contact_modal.dart

@@ -1,361 +0,0 @@
-import 'package:dialer/services/obfuscate_service.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_contacts/flutter_contacts.dart';
-import 'package:url_launcher/url_launcher.dart';
-import 'package:dialer/widgets/username_color_generator.dart';
-import '../../../services/block_service.dart';
-import '../../../services/contact_service.dart';
-import '../../../features/call/call_page.dart';
-import '../../../services/call_service.dart'; // Import CallService
-
-class ContactModal extends StatefulWidget {
-  final Contact contact;
-  final Function onEdit;
-  final Function onToggleFavorite;
-  final bool isFavorite;
-
-  const ContactModal({
-    super.key,
-    required this.contact,
-    required this.onEdit,
-    required this.onToggleFavorite,
-    required this.isFavorite,
-  });
-
-  @override
-  _ContactModalState createState() => _ContactModalState();
-}
-
-class _ContactModalState extends State<ContactModal> {
-  late String phoneNumber;
-  bool isBlocked = false;
-  final ObfuscateService _obfuscateService = ObfuscateService();
-  final CallService _callService = CallService(); // Instantiate CallService
-
-  @override
-  void initState() {
-    super.initState();
-    phoneNumber = widget.contact.phones.isNotEmpty
-        ? widget.contact.phones.first.number
-        : 'No phone number';
-    _checkIfBlocked();
-  }
-
-  Future<void> _checkIfBlocked() async {
-    if (phoneNumber != 'No phone number') {
-      bool blocked = await BlockService().isNumberBlocked(phoneNumber);
-      setState(() {
-        isBlocked = blocked;
-      });
-    }
-  }
-
-  Future<void> _toggleBlockState() async {
-    if (phoneNumber == 'No phone number') {
-      ScaffoldMessenger.of(context).showSnackBar(
-        const SnackBar(content: Text('No phone number to block or unblock')),
-      );
-    } else if (isBlocked) {
-      await BlockService().unblockNumber(phoneNumber);
-      ScaffoldMessenger.of(context).showSnackBar(
-        SnackBar(content: Text('$phoneNumber has been unblocked')),
-      );
-    } else {
-      await BlockService().blockNumber(phoneNumber);
-      ScaffoldMessenger.of(context).showSnackBar(
-        SnackBar(content: Text('$phoneNumber has been blocked')),
-      );
-    }
-
-    if (phoneNumber != 'No phone number') {
-      _checkIfBlocked();
-    }
-    Navigator.of(context).pop();
-  }
-
-  void _launchPhoneDialer(String phoneNumber) async {
-    final uri = Uri(scheme: 'tel', path: phoneNumber);
-    if (await canLaunchUrl(uri)) {
-      await launchUrl(uri);
-    } else {
-      debugPrint('Could not launch $phoneNumber');
-    }
-  }
-
-  void _launchSms(String phoneNumber) async {
-    final uri = Uri(scheme: 'sms', path: phoneNumber);
-    if (await canLaunchUrl(uri)) {
-      await launchUrl(uri);
-    } else {
-      debugPrint('Could not launch SMS to $phoneNumber');
-    }
-  }
-
-  void _launchEmail(String email) async {
-    final uri = Uri(scheme: 'mailto', path: email);
-    if (await canLaunchUrl(uri)) {
-      await launchUrl(uri);
-    } else {
-      debugPrint('Could not launch email to $email');
-    }
-  }
-
-  void _deleteContact() async {
-    final bool shouldDelete = await showDialog(
-      context: context,
-      builder: (context) => AlertDialog(
-        title: const Text('Delete Contact'),
-        content: Text(
-            'Are you sure you want to delete ${_obfuscateService.obfuscateData(widget.contact.displayName)}?'),
-        actions: [
-          TextButton(
-            onPressed: () => Navigator.of(context).pop(false),
-            child: const Text('Cancel'),
-          ),
-          TextButton(
-            onPressed: () => Navigator.of(context).pop(true),
-            child: const Text('Delete'),
-          ),
-        ],
-      ),
-    );
-
-    if (shouldDelete) {
-      try {
-        // Delete the contact
-        await FlutterContacts.deleteContact(widget.contact);
-
-        // Show success message
-        ScaffoldMessenger.of(context).showSnackBar(
-          SnackBar(content: Text('${_obfuscateService.obfuscateData(widget.contact.displayName)} deleted')),
-        );
-
-        // Close the modal
-        Navigator.of(context).pop();
-      } catch (e) {
-        // Handle errors and show a failure message
-        ScaffoldMessenger.of(context).showSnackBar(
-          SnackBar(content: Text('Failed to delete ${widget.contact.displayName}: $e')),
-        );
-      }
-    }
-  }
-
-  void _shareContactAsQRCode() {
-    // Use the ContactService to show the QR code for the contact's vCard
-    ContactService().showContactQRCodeDialog(context, widget.contact);
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    String email = widget.contact.emails.isNotEmpty
-        ? _obfuscateService.obfuscateData(widget.contact.emails.first.address)
-        : 'No email';
-
-    return GestureDetector(
-      onTap: () => Navigator.of(context).pop(),
-      child: Container(
-        color: Colors.black.withOpacity(0.5),
-        child: GestureDetector(
-          onTap: () {},
-          child: FractionallySizedBox(
-            child: Container(
-              decoration: BoxDecoration(
-                color: Colors.grey[900],
-                borderRadius:
-                const BorderRadius.vertical(top: Radius.circular(20)),
-              ),
-              child: Column(
-                mainAxisSize: MainAxisSize.min,
-                children: [
-                  // Modal Handle and Three-Dot Menu
-                  Stack(
-                    children: [
-                      Align(
-                        alignment: Alignment.center,
-                        child: Padding(
-                          padding: const EdgeInsets.symmetric(vertical: 10),
-                          child: Container(
-                            width: 50,
-                            height: 5,
-                            decoration: BoxDecoration(
-                              color: Colors.grey.shade300,
-                              borderRadius: BorderRadius.circular(5),
-                            ),
-                          ),
-                        ),
-                      ),
-                      Align(
-                        alignment: Alignment.topRight,
-                        child: Padding(
-                          padding: const EdgeInsets.only(top: 10, right: 10),
-                          child: PopupMenuButton<String>(
-                            icon: const Icon(Icons.more_vert,
-                                color: Colors.white),
-                            onSelected: (String choice) {
-                              if (choice == 'delete') {
-                                _deleteContact();
-                              } else if (choice == 'share') {
-                                _shareContactAsQRCode();
-                              }
-                              // Handle other choices if needed
-                            },
-                            itemBuilder: (BuildContext context) {
-                              return [
-                                const PopupMenuItem<String>(
-                                  value: 'show_associated_contacts',
-                                  child: Text('Show associated contacts'),
-                                ),
-                                const PopupMenuItem<String>(
-                                  value: 'delete',
-                                  child: Text('Delete'),
-                                ),
-                                const PopupMenuItem<String>(
-                                  value: 'share',
-                                  child: Text('Share (via QR code)'),
-                                ),
-                                const PopupMenuItem<String>(
-                                  value: 'create_shortcut',
-                                  child:
-                                  Text('Create shortcut (to home screen)'),
-                                ),
-                                const PopupMenuItem<String>(
-                                  value: 'set_ringtone',
-                                  child: Text('Set ringtone'),
-                                ),
-                              ];
-                            },
-                          ),
-                        ),
-                      ),
-                    ],
-                  ),
-                  // Contact Profile
-                  Padding(
-                    padding: const EdgeInsets.all(16.0),
-                    child: Column(
-                      children: [
-                        ObfuscatedAvatar(
-                          imageBytes: widget.contact.thumbnail,
-                          radius: 50,
-                          backgroundColor:
-                          generateColorFromName(widget.contact.displayName),
-                          fallbackInitial: widget.contact.displayName,
-                        ),
-                        const SizedBox(height: 10),
-                        Text(
-                          _obfuscateService.obfuscateData(widget.contact.displayName),
-                          style: const TextStyle(
-                              fontSize: 24,
-                              fontWeight: FontWeight.bold,
-                              color: Colors.white),
-                        ),
-                      ],
-                    ),
-                  ),
-                  const Divider(color: Colors.grey),
-                  // Contact Actions
-                  ListTile(
-                    leading: const Icon(Icons.phone, color: Colors.green),
-                    title: Text(
-                      _obfuscateService.obfuscateData(phoneNumber),
-                      style: const TextStyle(color: Colors.white),
-                    ),
-                    onTap: () async {
-                      if (widget.contact.phones.isNotEmpty) {
-                        await _callService.makeGsmCall(phoneNumber);
-                      }
-                    },
-                    onLongPress: () {
-                      // Navigate to the beautiful calling page demo
-                      Navigator.push(
-                        context,
-                        MaterialPageRoute(
-                          builder: (_) => CallPage(
-                            displayName: widget.contact.displayName,
-                            thumbnail: widget.contact.thumbnail,
-                          ),
-                        ),
-                      );
-                    },
-                  ),
-                  ListTile(
-                    leading: const Icon(Icons.message, color: Colors.blue),
-                    title: Text(
-                      _obfuscateService.obfuscateData(phoneNumber),
-                      style: const TextStyle(color: Colors.white),
-                    ),
-                    onTap: () {
-                      if (widget.contact.phones.isNotEmpty) {
-                        _launchSms(phoneNumber);
-                      }
-                    },
-                  ),
-                  ListTile(
-                    leading: const Icon(Icons.email, color: Colors.orange),
-                    title: Text(
-                      email,
-                      style: const TextStyle(color: Colors.white),
-                    ),
-                    onTap: () {
-                      if (widget.contact.emails.isNotEmpty) {
-                        _launchEmail(email);
-                      }
-                    },
-                  ),
-                  const Divider(color: Colors.grey),
-                  // Favorite, Edit, and Block/Unblock Buttons
-                  Padding(
-                    padding: const EdgeInsets.symmetric(horizontal: 16.0),
-                    child: Column(
-                      children: [
-                        // Favorite button
-                        SizedBox(
-                          width: double.infinity,
-                          child: ElevatedButton.icon(
-                            onPressed: () {
-                              Navigator.of(context).pop();
-                              widget.onToggleFavorite();
-                            },
-                            icon: Icon(widget.isFavorite
-                                ? Icons.star
-                                : Icons.star_border),
-                            label: Text(widget.isFavorite
-                                ? 'Unfavorite'
-                                : 'Favorite'),
-                          ),
-                        ),
-                        const SizedBox(height: 10),
-                        // Edit button
-                        SizedBox(
-                          width: double.infinity,
-                          child: ElevatedButton.icon(
-                            onPressed: () => widget.onEdit(),
-                            icon: const Icon(Icons.edit),
-                            label: const Text('Edit Contact'),
-                          ),
-                        ),
-                        const SizedBox(height: 10),
-                        // Block/Unblock button
-                        SizedBox(
-                          width: double.infinity,
-                          child: ElevatedButton.icon(
-                            onPressed: _toggleBlockState,
-                            icon: Icon(
-                                isBlocked ? Icons.block : Icons.block_flipped),
-                            label: Text(isBlocked ? 'Unblock' : 'Block'),
-                          ),
-                        ),
-                      ],
-                    ),
-                  ),
-                  const SizedBox(height: 16),
-                ],
-              ),
-            ),
-          ),
-        ),
-      ),
-    );
-  }
-}

dialer/lib/features/favorites/favorites_page.dart

@@ -1,32 +0,0 @@
-import 'package:dialer/features/contacts/contact_state.dart';
-import 'package:dialer/features/contacts/widgets/alphabet_scroll_page.dart';
-import 'package:flutter/material.dart';
-import 'package:dialer/widgets/loading_indicator.dart';
-
-class FavoritesPage extends StatefulWidget {
-  const FavoritesPage({super.key});
-
-  @override
-  _FavoritesPageState createState() => _FavoritesPageState();
-}
-
-class _FavoritesPageState extends State<FavoritesPage> {
-  @override
-  void initState() {
-    super.initState();
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    final contactState = ContactState.of(context);
-    return Scaffold(
-      body: contactState.loading
-          ? const LoadingIndicatorWidget()
-          : AlphabetScrollPage(
-              scrollOffset: contactState.scrollOffset,
-              contacts:
-                  contactState.favoriteContacts, // Use only favorites here
-            ),
-    );
-  }
-}

dialer/lib/globals.dart

@@ -1 +1,7 @@
-bool isStealthMode = false;
+// Global variables accessible throughout the app
+library globals;
+
+import 'core/config/app_config.dart';
+
+// Whether the app is in stealth mode (obfuscated content)
+bool get isStealthMode => AppConfig.isStealthMode;

dialer/lib/main.dart

@@ -1,17 +1,35 @@
-import 'package:dialer/features/home/home_page.dart';
+import 'package:dialer/presentation/features/home/home_page.dart';
+import 'package:dialer/presentation/features/home/default_dialer_prompt.dart';
 import 'package:flutter/material.dart';
-import 'package:dialer/features/contacts/contact_state.dart';
-import 'globals.dart' as globals;
-import 'package:dialer/services/cryptography/asymmetric_crypto_service.dart';
+import 'package:flutter/services.dart';
+import 'package:permission_handler/permission_handler.dart';
 import 'package:provider/provider.dart';
 
+import 'core/config/app_config.dart';
+import 'domain/services/call_service.dart';
+import 'domain/services/cryptography/asymmetric_crypto_service.dart';
+import 'presentation/features/contacts/contact_state.dart';
+
 void main() async {
   WidgetsFlutterBinding.ensureInitialized();
-  const stealthFlag = String.fromEnvironment('STEALTH', defaultValue: 'false');
-  globals.isStealthMode = stealthFlag.toLowerCase() == 'true';
   
+  // Initialize app configuration
+  await AppConfig.initialize();
+
+  // Initialize cryptography service with error handling
   final AsymmetricCryptoService cryptoService = AsymmetricCryptoService();
+  try {
     await cryptoService.initializeDefaultKeyPair();
+  } catch (e) {
+    debugPrint('Error initializing cryptography: $e');
+    // Continue app initialization even if crypto fails
+  }
+
+  // Request permissions before running the app
+  await _requestPermissions();
+
+  // Initialize call service
+  CallService();
 
   runApp(
     MultiProvider(
@@ -19,25 +37,69 @@ void main() async {
         Provider<AsymmetricCryptoService>(
           create: (_) => cryptoService,
         ),
-        // Add other providers here
       ],
-      child: Dialer(),
+      child: const DialerApp(),
     ),
   );
 }
 
-class Dialer extends StatelessWidget {
-  const Dialer({super.key});
+Future<void> _requestPermissions() async {
+  Map<Permission, PermissionStatus> statuses = await [
+    Permission.phone,
+    Permission.contacts,
+    Permission.microphone,
+  ].request();
+  if (statuses.values.every((status) => status.isGranted)) {
+    print("All required permissions granted");
+    const channel = MethodChannel('call_service');
+    await channel.invokeMethod('permissionsGranted');
+  } else {
+    print("Permissions denied: ${statuses.entries.where((e) => !e.value.isGranted).map((e) => e.key).join(', ')}");
+  }
+}
+
+class DialerApp extends StatelessWidget {
+  const DialerApp({super.key});
+
+  Future<bool> _isDefaultDialer() async {
+    const channel = MethodChannel('call_service');
+    try {
+      final isDefault = await channel.invokeMethod<bool>('isDefaultDialer');
+      return isDefault ?? false;
+    } catch (e) {
+      print('Error checking default dialer: $e');
+      return false;
+    }
+  }
 
   @override
   Widget build(BuildContext context) {
     return ContactState(
       child: MaterialApp(
+        title: 'Dialer App',
+        navigatorKey: CallService.navigatorKey,
         theme: ThemeData(
-          brightness: Brightness.dark
+          brightness: Brightness.dark,
+        ),
+        initialRoute: '/',
+        routes: {
+          '/': (context) => FutureBuilder<bool>(
+                future: _isDefaultDialer(),
+                builder: (context, snapshot) {
+                  if (snapshot.connectionState == ConnectionState.waiting) {
+                    return Scaffold(
+                      body: Center(child: CircularProgressIndicator()),
+                    );
+                  }
+                  if (snapshot.hasError || !snapshot.hasData || snapshot.data == false) {
+                    return DefaultDialerPromptScreen();
+                  }
+                  return SafeArea(child: MyHomePage());
+                },
+              ),
+          '/home': (context) => SafeArea(child: MyHomePage()),
+        },
       ),
-        home: SafeArea(child: MyHomePage()),
-      )
     );
   }
 }

dialer/lib/presentation/common/theme/app_theme.dart

@@ -0,0 +1,42 @@
+import 'package:flutter/material.dart';
+
+class AppTheme {
+  static ThemeData get darkTheme => ThemeData(
+    brightness: Brightness.dark,
+    scaffoldBackgroundColor: Colors.black,
+    appBarTheme: const AppBarTheme(
+      backgroundColor: Colors.black,
+      elevation: 0,
+    ),
+    tabBarTheme: const TabBarThemeData(
+      labelColor: Colors.white,
+      unselectedLabelColor: Color.fromARGB(255, 158, 158, 158),
+      indicatorSize: TabBarIndicatorSize.label,
+      indicatorColor: Colors.white,
+    ),
+    bottomNavigationBarTheme: const BottomNavigationBarThemeData(
+      backgroundColor: Colors.black,
+    ),
+    floatingActionButtonTheme: const FloatingActionButtonThemeData(
+      backgroundColor: Colors.blue,
+      foregroundColor: Colors.white,
+    ),
+    textTheme: const TextTheme(
+      bodyLarge: TextStyle(color: Colors.white),
+      bodyMedium: TextStyle(color: Colors.white),
+      titleLarge: TextStyle(color: Colors.white),
+    ),
+    snackBarTheme: const SnackBarThemeData(
+      backgroundColor: Color(0xFF303030),
+      contentTextStyle: TextStyle(color: Colors.white),
+    ),
+    inputDecorationTheme: InputDecorationTheme(
+      border: OutlineInputBorder(
+        borderRadius: BorderRadius.circular(8),
+        borderSide: BorderSide.none,
+      ),
+      filled: true,
+      fillColor: const Color.fromARGB(255, 30, 30, 30),
+    ),
+  );
+}

dialer/lib/presentation/common/widgets/color_darkener.dart

@@ -0,0 +1,21 @@
+import 'package:flutter/material.dart';
+
+/// Darkens a color by a given percentage
+Color darken(Color color, [double amount = 0.3]) {
+  assert(amount >= 0 && amount <= 1);
+  
+  final hsl = HSLColor.fromColor(color);
+  final darkened = hsl.withLightness((hsl.lightness - amount).clamp(0.0, 1.0));
+  
+  return darkened.toColor();
+}
+
+/// Lightens a color by a given percentage
+Color lighten(Color color, [double amount = 0.3]) {
+  assert(amount >= 0 && amount <= 1);
+  
+  final hsl = HSLColor.fromColor(color);
+  final lightened = hsl.withLightness((hsl.lightness + amount).clamp(0.0, 1.0));
+  
+  return lightened.toColor();
+}

dialer/lib/presentation/common/widgets/sim_selection_dialog.dart

@@ -0,0 +1,204 @@
+import 'package:flutter/material.dart';
+import 'package:sim_data_new/sim_data.dart';
+
+class SimSelectionDialog extends StatefulWidget {
+  final String phoneNumber;
+  final String displayName;
+  final Function(int simSlot) onSimSelected;
+
+  const SimSelectionDialog({
+    super.key,
+    required this.phoneNumber,
+    required this.displayName,
+    required this.onSimSelected,
+  });
+
+  @override
+  _SimSelectionDialogState createState() => _SimSelectionDialogState();
+}
+
+class _SimSelectionDialogState extends State<SimSelectionDialog> {
+  SimData? _simData;
+  bool _isLoading = true;
+  String? _error;
+  int? _selectedSimSlot;
+
+  @override
+  void initState() {
+    super.initState();
+    _loadSimCards();
+  }
+
+  void _loadSimCards() async {
+    try {
+      final simData = await SimDataPlugin.getSimData();
+      setState(() {
+        _simData = simData;
+        _isLoading = false;
+        _error = null;
+      });
+    } catch (e) {
+      setState(() {
+        _isLoading = false;
+        _error = e.toString();
+      });
+      print('Error loading SIM cards: $e');
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return AlertDialog(
+      backgroundColor: Colors.grey[900],
+      title: const Text(
+        'Select SIM for Call',
+        style: TextStyle(color: Colors.white),
+      ),
+      content: _buildContent(),
+      actions: [
+        TextButton(
+          onPressed: () => Navigator.of(context).pop(),
+          child: const Text(
+            'Cancel',
+            style: TextStyle(color: Colors.grey),
+          ),
+        ),
+        if (_selectedSimSlot != null)
+          TextButton(
+            onPressed: () {
+              widget.onSimSelected(_selectedSimSlot!);
+              Navigator.of(context).pop();
+            },
+            child: const Text(
+              'Switch SIM',
+              style: TextStyle(color: Colors.blue),
+            ),
+          ),
+      ],
+    );
+  }
+
+  Widget _buildContent() {
+    if (_isLoading) {
+      return const SizedBox(
+        height: 100,
+        child: Center(
+          child: CircularProgressIndicator(color: Colors.blue),
+        ),
+      );
+    }
+
+    if (_error != null) {
+      return _buildErrorContent();
+    }
+
+    if (_simData?.cards.isEmpty ?? true) {
+      return _buildFallbackContent();
+    }
+
+    return _buildSimList();
+  }
+
+  Widget _buildErrorContent() {
+    return Column(
+      mainAxisSize: MainAxisSize.min,
+      children: [
+        const Icon(
+          Icons.error_outline,
+          color: Colors.red,
+          size: 48,
+        ),
+        const SizedBox(height: 16),
+        Text(
+          'Error loading SIM cards',
+          style: const TextStyle(color: Colors.white),
+        ),
+        const SizedBox(height: 8),
+        Text(
+          _error!,
+          style: const TextStyle(color: Colors.grey, fontSize: 12),
+        ),
+        const SizedBox(height: 16),
+        ElevatedButton(
+          onPressed: _loadSimCards,
+          child: const Text('Retry'),
+        ),
+      ],
+    );
+  }
+
+  Widget _buildFallbackContent() {
+    return Column(
+      mainAxisSize: MainAxisSize.min,
+      children: [
+        _buildSimTile('SIM 1', 'Slot 0', 0),
+        _buildSimTile('SIM 2', 'Slot 1', 1),
+      ],
+    );
+  }
+
+  Widget _buildSimList() {
+    return Column(
+      mainAxisSize: MainAxisSize.min,
+      children: _simData!.cards.map((card) {
+        final index = _simData!.cards.indexOf(card);
+        return _buildSimTile(
+          _getSimDisplayName(card, index),
+          _getSimSubtitle(card),
+          card.slotIndex,
+        );
+      }).toList(),
+    );
+  }
+
+  Widget _buildSimTile(String title, String subtitle, int slotIndex) {
+    return RadioListTile<int>(
+      title: Text(
+        title,
+        style: const TextStyle(color: Colors.white),
+      ),
+      subtitle: Text(
+        subtitle,
+        style: const TextStyle(color: Colors.grey),
+      ),
+      value: slotIndex,
+      groupValue: _selectedSimSlot,
+      onChanged: (value) {
+        setState(() {
+          _selectedSimSlot = value;
+        });
+      },
+      activeColor: Colors.blue,
+    );
+  }
+
+  String _getSimDisplayName(dynamic card, int index) {
+    if (card.displayName != null && card.displayName.isNotEmpty) {
+      return card.displayName;
+    }
+    if (card.carrierName != null && card.carrierName.isNotEmpty) {
+      return card.carrierName;
+    }
+    return 'SIM ${index + 1}';
+  }
+
+  String _getSimSubtitle(dynamic card) {
+    List<String> subtitleParts = [];
+
+    if (card.phoneNumber != null && card.phoneNumber.isNotEmpty) {
+      subtitleParts.add(card.phoneNumber);
+    }
+
+    if (card.carrierName != null &&
+        card.carrierName.isNotEmpty &&
+        (card.displayName == null || card.displayName.isEmpty)) {
+      subtitleParts.add(card.carrierName);
+    }
+
+    if (subtitleParts.isEmpty) {
+      subtitleParts.add('Slot ${card.slotIndex}');
+    }
+
+    return subtitleParts.join(' • ');
+  }
+}

dialer/lib/presentation/common/widgets/username_color_generator.dart

@@ -0,0 +1,17 @@
+import 'package:flutter/material.dart';
+
+/// Generates a deterministic color from a string input
+Color generateColorFromName(String name) {
+  if (name.isEmpty) return Colors.grey;
+  
+  // Use the hashCode of the name to generate a consistent color
+  int hash = name.hashCode;
+  
+  // Use the hash to generate RGB values
+  final r = (hash & 0xFF0000) >> 16;
+  final g = (hash & 0x00FF00) >> 8;
+  final b = hash & 0x0000FF;
+  
+  // Create a color with these RGB values
+  return Color.fromARGB(255, r, g, b);
+}

dialer/lib/presentation/features/call/call_page.dart

@@ -0,0 +1,727 @@
+import 'dart:async';
+import 'package:flutter/material.dart';
+import 'package:flutter_contacts/flutter_contacts.dart';
+import 'package:dialer/domain/services/call_service.dart';
+import 'package:dialer/domain/services/obfuscate_service.dart';
+import 'package:dialer/presentation/common/widgets/username_color_generator.dart';
+import 'package:dialer/presentation/common/widgets/sim_selection_dialog.dart';
+import 'package:flutter/services.dart';
+import 'package:sim_data_new/sim_data.dart';
+
+class CallPage extends StatefulWidget {
+  final String displayName;
+  final String phoneNumber;
+  final Uint8List? thumbnail;
+
+  const CallPage({
+    super.key,
+    required this.displayName,
+    required this.phoneNumber,
+    this.thumbnail,
+  });
+
+  @override
+  _CallPageState createState() => _CallPageState();
+}
+
+class _CallPageState extends State<CallPage> {
+  final ObfuscateService _obfuscateService = ObfuscateService();
+  final CallService _callService = CallService();
+  bool isMuted = false;
+  bool isSpeaker = false;
+  bool isKeypadVisible = false;
+  bool icingProtocolOk = true;
+  String _typedDigits = "";
+  Timer? _callTimer;
+  int _callSeconds = 0;
+  String _callStatus = "Calling...";
+  StreamSubscription<String>? _callStateSubscription;
+  StreamSubscription<Map<String, dynamic>>? _audioStateSubscription;
+  StreamSubscription<int?>? _simStateSubscription;
+  bool _isCallActive = true; // Track if call is still active
+  String? _simName; // Human-readable SIM card name
+
+  bool get isNumberUnknown => widget.displayName == widget.phoneNumber;
+
+  // Fetch and update human-readable SIM name based on slot
+  Future<void> _updateSimName(int? simSlot) async {
+    if (!mounted) return;
+    if (simSlot != null) {
+      try {
+        final simData = await SimDataPlugin.getSimData();
+        // Find the SIM card matching the slot index, if any
+        dynamic card;
+        for (var c in simData.cards) {
+          if (c.slotIndex == simSlot) {
+            card = c;
+            break;
+          }
+        }
+        String name;
+        if (card != null && card.displayName.isNotEmpty) {
+          name = card.displayName;
+        } else if (card != null && card.carrierName.isNotEmpty) {
+          name = card.carrierName;
+        } else {
+          name = 'SIM ${simSlot + 1}';
+        }
+        setState(() {
+          _simName = name;
+        });
+      } catch (e) {
+        setState(() {
+          _simName = 'SIM ${simSlot + 1}';
+        });
+      }
+    } else {
+      setState(() {
+        _simName = null;
+      });
+    }
+  }
+
+  @override
+  void initState() {
+    super.initState();
+    _checkInitialCallState();
+    _listenToCallState();
+    _listenToAudioState();
+    _listenToSimState();
+    _updateSimName(CallService.getCurrentSimSlot); // Initial SIM name
+    _setInitialAudioState();
+  }
+
+  @override
+  void dispose() {
+    _callTimer?.cancel();
+    _callStateSubscription?.cancel();
+    _audioStateSubscription?.cancel();
+    _simStateSubscription?.cancel();
+    super.dispose();
+  }
+
+  void _setInitialAudioState() {
+    final initialAudioState = _callService.currentAudioState;
+    if (initialAudioState != null) {
+      setState(() {
+        isMuted = initialAudioState['muted'] ?? false;
+        isSpeaker = initialAudioState['speaker'] ?? false;
+      });
+    }
+  }
+
+  void _checkInitialCallState() async {
+    try {
+      final state = await _callService.getCallState();
+      print('CallPage: Initial call state: $state');
+      if (mounted) {
+        setState(() {
+          if (state == "active") {
+            _callStatus = "00:00";
+            _isCallActive = true;
+            _startCallTimer();
+          } else if (state == "disconnected" || state == "disconnecting") {
+            _callStatus = "Call Ended";
+            _isCallActive = false;
+          } else {
+            _callStatus = "Calling...";
+            _isCallActive = true;
+          }
+        });
+      }
+    } catch (e) {
+      print('CallPage: Error checking initial state: $e');
+    }
+  }
+
+  void _listenToCallState() {
+    _callStateSubscription = _callService.callStateStream.listen((state) {
+      print('CallPage: Call state changed to $state');
+      if (mounted) {
+        setState(() {
+          if (state == "active") {
+            _callStatus = "00:00";
+            _isCallActive = true;
+            _startCallTimer();
+          } else if (state == "disconnected" || state == "disconnecting") {
+            _callTimer?.cancel();
+            _callStatus = "Call Ended";
+            _isCallActive = false;
+            // Let CallService handle navigation - don't navigate from here
+          } else {
+            _callStatus = "Calling...";
+            _isCallActive = true;
+          }
+        });
+      }
+    });
+  }
+
+  void _listenToAudioState() {
+    _audioStateSubscription = _callService.audioStateStream.listen((state) {
+      if (mounted) {
+        setState(() {
+          isMuted = state['muted'] ?? isMuted;
+          isSpeaker = state['speaker'] ?? isSpeaker;
+        });
+      }
+    });
+  }
+
+  void _listenToSimState() {
+    _simStateSubscription = _callService.simStateStream.listen((simSlot) {
+      _updateSimName(simSlot);
+    });
+  }
+
+  void _startCallTimer() {
+    _callTimer?.cancel();
+    _callTimer = Timer.periodic(const Duration(seconds: 1), (timer) {
+      if (mounted) {
+        setState(() {
+          _callSeconds++;
+          final minutes = (_callSeconds ~/ 60).toString().padLeft(2, '0');
+          final seconds = (_callSeconds % 60).toString().padLeft(2, '0');
+          _callStatus = '$minutes:$seconds';
+        });
+      }
+    });
+  }
+
+  void _addDigit(String digit) async {
+    print('CallPage: Tapped digit: $digit');
+    setState(() {
+      _typedDigits += digit;
+    });
+    // Send DTMF tone
+    const channel = MethodChannel('call_service');
+    try {
+      final success =
+          await channel.invokeMethod<bool>('sendDtmfTone', {'digit': digit});
+      if (success != true) {
+        print('CallPage: Failed to send DTMF tone for $digit');
+        if (mounted) {
+          ScaffoldMessenger.of(context).showSnackBar(
+            SnackBar(content: Text('Failed to send DTMF tone')),
+          );
+        }
+      }
+    } catch (e) {
+      print('CallPage: Error sending DTMF tone: $e');
+      if (mounted) {
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(content: Text('Error sending DTMF tone: $e')),
+        );
+      }
+    }
+  }
+
+  void _toggleMute() async {
+    try {
+      print('CallPage: Toggling mute, current state: $isMuted');
+      final result = await _callService.muteCall(context, mute: !isMuted);
+      print('CallPage: Mute call result: $result');
+      if (mounted && result['status'] != 'success') {
+        print('CallPage: Failed to toggle mute: ${result['message']}');
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(
+              content: Text('Failed to toggle mute: ${result['message']}')),
+        );
+      }
+    } catch (e) {
+      print('CallPage: Error toggling mute: $e');
+      if (mounted) {
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(content: Text('Error toggling mute: $e')),
+        );
+      }
+    }
+  }
+
+  Future<void> _toggleSpeaker() async {
+    try {
+      print('CallPage: Toggling speaker, current state: $isSpeaker');
+      final result =
+          await _callService.speakerCall(context, speaker: !isSpeaker);
+      print('CallPage: Speaker call result: $result');
+      if (mounted && result['status'] != 'success') {
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(
+              content: Text('Failed to toggle speaker: ${result['message']}')),
+        );
+      }
+    } catch (e) {
+      print('CallPage: Error toggling speaker: $e');
+      if (mounted) {
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(content: Text('Error toggling speaker: $e')),
+        );
+      }
+    }
+  }
+
+  void _toggleKeypad() {
+    setState(() {
+      isKeypadVisible = !isKeypadVisible;
+    });
+  }
+
+  void _showSimSelectionDialog() {
+    showDialog(
+      context: context,
+      builder: (BuildContext context) {
+        return SimSelectionDialog(
+          phoneNumber: widget.phoneNumber,
+          displayName: widget.displayName,
+          onSimSelected: _switchToNewSim,
+        );
+      },
+    );
+  }
+
+  void _switchToNewSim(int simSlot) async {
+    try {
+      print(
+          'CallPage: Initiating SIM switch to slot $simSlot for ${widget.phoneNumber}');
+
+      // Use the CallService to handle the SIM switch logic
+      await _callService.switchSimAndRedial(
+        phoneNumber: widget.phoneNumber,
+        displayName: widget.displayName,
+        simSlot: simSlot,
+        thumbnail: widget.thumbnail,
+      );
+
+      print('CallPage: SIM switch initiated successfully');
+    } catch (e) {
+      print('CallPage: Error initiating SIM switch: $e');
+
+      // Show error feedback if widget is still mounted
+      if (mounted) {
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(
+            content: Text('Error switching SIM: $e'),
+            backgroundColor: Colors.red,
+          ),
+        );
+      }
+    }
+  }
+
+  void _hangUp() async {
+    // Don't try to hang up if call is already ended
+    if (!_isCallActive) {
+      print('CallPage: Ignoring hangup - call already ended');
+      return;
+    }
+
+    try {
+      print(
+          'CallPage: Initiating manual hangUp - canceling any pending SIM switch');
+
+      // Immediately mark call as inactive to prevent further interactions
+      setState(() {
+        _isCallActive = false;
+        _callStatus = "Ending Call...";
+      });
+
+      // Cancel any pending SIM switch since user is manually hanging up
+      _callService.cancelPendingSimSwitch();
+
+      final result = await _callService.hangUpCall(context);
+      print('CallPage: Hang up result: $result');
+      
+      // If the page is still visible after hangup, try to close it
+      if (mounted && ModalRoute.of(context)?.isCurrent == true) {
+        print('CallPage: Still visible after hangup, navigating back');
+        Navigator.of(context).popUntil((route) => route.isFirst);
+      }
+    } catch (e) {
+      print('CallPage: Error hanging up: $e');
+      if (mounted) {
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(content: Text('Error hanging up: $e')),
+        );
+      }
+    }
+  }
+
+  void _addContact() async {
+    if (await FlutterContacts.requestPermission()) {
+      final newContact = Contact()..phones = [Phone(widget.phoneNumber)];
+      final updatedContact =
+          await FlutterContacts.openExternalInsert(newContact);
+      if (mounted && updatedContact != null) {
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(content: Text('Contact added successfully!')),
+        );
+      }
+    } else {
+      if (mounted) {
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(content: Text('Permission denied for contacts')),
+        );
+      }
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final double avatarRadius = isKeypadVisible ? 45.0 : 45.0;
+    final double nameFontSize = isKeypadVisible ? 24.0 : 24.0;
+    final double statusFontSize = isKeypadVisible ? 16.0 : 16.0;
+
+    print(
+        'CallPage: Building UI, _callStatus: $_callStatus, route: ${ModalRoute.of(context)?.settings.name ?? "unknown"}');
+
+    // If call is disconnected and we're not actively navigating, force navigation
+    if ((_callStatus == "Call Ended" || !_isCallActive) && mounted) {
+      WidgetsBinding.instance.addPostFrameCallback((_) {
+        if (mounted && ModalRoute.of(context)?.isCurrent == true) {
+          print('CallPage: Call ended, forcing navigation back to home');
+          Navigator.of(context).popUntil((route) => route.isFirst);
+        }
+      });
+    }
+
+    return PopScope(
+      canPop:
+          true, // Always allow popping - CallService manages when it's appropriate
+      onPopInvoked: (didPop) {
+        print(
+            'CallPage: PopScope onPopInvoked - didPop: $didPop, _isCallActive: $_isCallActive, _callStatus: $_callStatus');
+        // No longer prevent popping during active calls - CallService handles this
+      },
+      child: Scaffold(
+        body: Container(
+          color: Colors.black,
+          child: SafeArea(
+            child: Column(
+              children: [
+                Container(
+                  padding: const EdgeInsets.symmetric(vertical: 8.0),
+                  child: Column(
+                    mainAxisSize: MainAxisSize.min,
+                    children: [
+                      const SizedBox(height: 35),
+                      ObfuscatedAvatar(
+                        imageBytes: widget.thumbnail,
+                        radius: avatarRadius,
+                        backgroundColor:
+                            generateColorFromName(widget.displayName),
+                        fallbackInitial: widget.displayName,
+                      ),
+                      const SizedBox(height: 4),
+                      Row(
+                        mainAxisAlignment: MainAxisAlignment.center,
+                        children: [
+                          Icon(
+                            icingProtocolOk ? Icons.lock : Icons.lock_open,
+                            color: icingProtocolOk ? Colors.green : Colors.red,
+                            size: 16,
+                          ),
+                          const SizedBox(width: 4),
+                          Text(
+                            'Icing protocol: ${icingProtocolOk ? "ok" : "ko"}',
+                            style: TextStyle(
+                              color:
+                                  icingProtocolOk ? Colors.green : Colors.red,
+                              fontSize: 12,
+                              fontWeight: FontWeight.bold,
+                            ),
+                          ),
+                        ],
+                      ),
+                      const SizedBox(height: 4),
+                      Text(
+                        _obfuscateService.obfuscateData(widget.displayName),
+                        style: TextStyle(
+                          fontSize: nameFontSize,
+                          color: Colors.white,
+                          fontWeight: FontWeight.bold,
+                        ),
+                      ),
+                      Text(
+                        widget.phoneNumber,
+                        style: TextStyle(
+                          fontSize: statusFontSize,
+                          color: Colors.white70,
+                        ),
+                      ),
+                      Text(
+                        _callStatus,
+                        style: TextStyle(
+                          fontSize: statusFontSize,
+                          color: Colors.white70,
+                        ),
+                      ),
+                      // Show SIM information if a SIM slot has been set
+                      if (_simName != null)
+                        Container(
+                          margin: const EdgeInsets.only(top: 4.0),
+                          padding: const EdgeInsets.symmetric(
+                              horizontal: 8.0, vertical: 2.0),
+                          decoration: BoxDecoration(
+                            color: Colors.blue.withOpacity(0.2),
+                            borderRadius: BorderRadius.circular(12),
+                            border: Border.all(
+                              color: Colors.blue.withOpacity(0.5),
+                              width: 1,
+                            ),
+                          ),
+                          child: Text(
+                            // Show human-readable SIM name plus slot number
+                            '$_simName (SIM ${CallService.getCurrentSimSlot! + 1})',
+                            style: TextStyle(
+                              fontSize: statusFontSize - 2,
+                              color: Colors.lightBlueAccent,
+                              fontWeight: FontWeight.w500,
+                            ),
+                          ),
+                        ),
+                    ],
+                  ),
+                ),
+                Expanded(
+                  child: Column(
+                    children: [
+                      if (isKeypadVisible) ...[
+                        const Spacer(flex: 2),
+                        Padding(
+                          padding: const EdgeInsets.symmetric(horizontal: 20.0),
+                          child: Row(
+                            mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                            children: [
+                              Expanded(
+                                child: Text(
+                                  _typedDigits,
+                                  maxLines: 1,
+                                  textAlign: TextAlign.right,
+                                  overflow: TextOverflow.ellipsis,
+                                  style: const TextStyle(
+                                    fontSize: 24,
+                                    color: Colors.white,
+                                    fontWeight: FontWeight.bold,
+                                  ),
+                                ),
+                              ),
+                              IconButton(
+                                padding: EdgeInsets.zero,
+                                onPressed: _toggleKeypad,
+                                icon: const Icon(
+                                  Icons.close,
+                                  color: Colors.white,
+                                ),
+                              ),
+                            ],
+                          ),
+                        ),
+                        Container(
+                          height: MediaQuery.of(context).size.height * 0.4,
+                          margin: const EdgeInsets.symmetric(horizontal: 20),
+                          padding: const EdgeInsets.all(8),
+                          child: GridView.count(
+                            shrinkWrap: true,
+                            physics: const NeverScrollableScrollPhysics(),
+                            crossAxisCount: 3,
+                            childAspectRatio: 1.5,
+                            mainAxisSpacing: 8,
+                            crossAxisSpacing: 8,
+                            children: List.generate(12, (index) {
+                              String label;
+                              if (index < 9) {
+                                label = '${index + 1}';
+                              } else if (index == 9) {
+                                label = '*';
+                              } else if (index == 10) {
+                                label = '0';
+                              } else {
+                                label = '#';
+                              }
+                              return GestureDetector(
+                                onTap: () => _addDigit(label),
+                                child: Container(
+                                  decoration: const BoxDecoration(
+                                    shape: BoxShape.circle,
+                                    color: Colors.transparent,
+                                  ),
+                                  child: Center(
+                                    child: Text(
+                                      label,
+                                      style: const TextStyle(
+                                        fontSize: 32,
+                                        color: Colors.white,
+                                      ),
+                                    ),
+                                  ),
+                                ),
+                              );
+                            }),
+                          ),
+                        ),
+                        const Spacer(flex: 1),
+                      ] else ...[
+                        const Spacer(),
+                        Padding(
+                          padding: const EdgeInsets.symmetric(horizontal: 32.0),
+                          child: Column(
+                            mainAxisSize: MainAxisSize.min,
+                            children: [
+                              Row(
+                                mainAxisAlignment:
+                                    MainAxisAlignment.spaceEvenly,
+                                children: [
+                                  Column(
+                                    mainAxisSize: MainAxisSize.min,
+                                    children: [
+                                      IconButton(
+                                        onPressed: _toggleMute,
+                                        icon: Icon(
+                                          isMuted ? Icons.mic_off : Icons.mic,
+                                          color: isMuted
+                                              ? Colors.amber
+                                              : Colors.white,
+                                          size: 32,
+                                        ),
+                                      ),
+                                      Text(
+                                        isMuted ? 'Unmute' : 'Mute',
+                                        style: const TextStyle(
+                                          color: Colors.white,
+                                          fontSize: 14,
+                                        ),
+                                      ),
+                                    ],
+                                  ),
+                                  Column(
+                                    mainAxisSize: MainAxisSize.min,
+                                    children: [
+                                      IconButton(
+                                        onPressed: _toggleKeypad,
+                                        icon: const Icon(
+                                          Icons.dialpad,
+                                          color: Colors.white,
+                                          size: 32,
+                                        ),
+                                      ),
+                                      const Text(
+                                        'Keypad',
+                                        style: TextStyle(
+                                          color: Colors.white,
+                                          fontSize: 14,
+                                        ),
+                                      ),
+                                    ],
+                                  ),
+                                  Column(
+                                    mainAxisSize: MainAxisSize.min,
+                                    children: [
+                                      IconButton(
+                                        onPressed: _toggleSpeaker,
+                                        icon: Icon(
+                                          isSpeaker
+                                              ? Icons.volume_up
+                                              : Icons.volume_off,
+                                          color: isSpeaker
+                                              ? Colors.amber
+                                              : Colors.white,
+                                          size: 32,
+                                        ),
+                                      ),
+                                      const Text(
+                                        'Speaker',
+                                        style: TextStyle(
+                                          color: Colors.white,
+                                          fontSize: 14,
+                                        ),
+                                      ),
+                                    ],
+                                  ),
+                                ],
+                              ),
+                              const SizedBox(height: 20),
+                              Row(
+                                mainAxisAlignment:
+                                    MainAxisAlignment.spaceEvenly,
+                                children: [
+                                  if (isNumberUnknown)
+                                    Column(
+                                      mainAxisSize: MainAxisSize.min,
+                                      children: [
+                                        IconButton(
+                                          onPressed: _addContact,
+                                          icon: const Icon(
+                                            Icons.person_add,
+                                            color: Colors.white,
+                                            size: 32,
+                                          ),
+                                        ),
+                                        const Text(
+                                          'Add Contact',
+                                          style: TextStyle(
+                                            color: Colors.white,
+                                            fontSize: 14,
+                                          ),
+                                        ),
+                                      ],
+                                    ),
+                                  Column(
+                                    mainAxisSize: MainAxisSize.min,
+                                    children: [
+                                      IconButton(
+                                        onPressed: _isCallActive
+                                            ? _showSimSelectionDialog
+                                            : null,
+                                        icon: Icon(
+                                          Icons.sim_card,
+                                          color: _isCallActive
+                                              ? Colors.white
+                                              : Colors.grey,
+                                          size: 32,
+                                        ),
+                                      ),
+                                      const Text(
+                                        'Change SIM',
+                                        style: TextStyle(
+                                          color: Colors.white,
+                                          fontSize: 14,
+                                        ),
+                                      ),
+                                    ],
+                                  ),
+                                ],
+                              ),
+                            ],
+                          ),
+                        ),
+                        const Spacer(flex: 3),
+                      ],
+                    ],
+                  ),
+                ),
+                Padding(
+                  padding: const EdgeInsets.only(bottom: 16.0),
+                  child: GestureDetector(
+                    onTap: _isCallActive ? _hangUp : null,
+                    child: Container(
+                      padding: const EdgeInsets.all(12),
+                      decoration: BoxDecoration(
+                        color: _isCallActive ? Colors.red : Colors.grey,
+                        shape: BoxShape.circle,
+                      ),
+                      child: Icon(
+                        _isCallActive ? Icons.call_end : Icons.call_end,
+                        color: Colors.white,
+                        size: 32,
+                      ),
+                    ),
+                  ),
+                ),
+              ],
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+}

dialer/lib/presentation/features/call/incoming_call_page.dart

@@ -0,0 +1,163 @@
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+import 'dart:typed_data';
+import '../../../domain/services/call_service.dart';
+import '../../../domain/services/obfuscate_service.dart';
+import 'package:dialer/presentation/common/widgets/username_color_generator.dart';
+import 'call_page.dart';
+
+class IncomingCallPage extends StatefulWidget {
+  final String displayName;
+  final String phoneNumber;
+  final Uint8List? thumbnail;
+
+  const IncomingCallPage({
+    super.key,
+    required this.displayName,
+    required this.phoneNumber,
+    this.thumbnail,
+  });
+
+  @override
+  _IncomingCallPageState createState() => _IncomingCallPageState();
+}
+
+class _IncomingCallPageState extends State<IncomingCallPage> {
+  static const MethodChannel _channel = MethodChannel('call_service');
+  final ObfuscateService _obfuscateService = ObfuscateService();
+  final CallService _callService = CallService();
+
+  void _answerCall() async {
+    try {
+      final result = await _channel.invokeMethod('answerCall');
+      debugPrint('IncomingCallPage: Answer call result: $result');
+      
+      if (result["status"] == "answered") {
+        if (!mounted) return;
+        
+        Navigator.pushReplacement(
+          context,
+          MaterialPageRoute(
+            builder: (context) => CallPage(
+              displayName: widget.displayName,
+              phoneNumber: widget.phoneNumber,
+              thumbnail: widget.thumbnail,
+            ),
+          ),
+        );
+      }
+    } catch (e) {
+      debugPrint("IncomingCallPage: Error answering call: $e");
+      if (!mounted) return;
+      
+      ScaffoldMessenger.of(context).showSnackBar(
+        SnackBar(content: Text("Error answering call: $e")),
+      );
+    }
+  }
+
+  void _declineCall() async {
+    try {
+      await _callService.hangUpCall(context);
+    } catch (e) {
+      debugPrint("IncomingCallPage: Error declining call: $e");
+      if (!mounted) return;
+      
+      ScaffoldMessenger.of(context).showSnackBar(
+        SnackBar(content: Text("Error declining call: $e")),
+      );
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      backgroundColor: Colors.black,
+      body: SafeArea(
+        child: Column(
+          children: [
+            const Spacer(),
+            ObfuscatedAvatar(
+              imageBytes: widget.thumbnail,
+              radius: 60,
+              backgroundColor: generateColorFromName(widget.displayName),
+              fallbackInitial: widget.displayName,
+            ),
+            const SizedBox(height: 24),
+            Text(
+              _obfuscateService.obfuscateData(widget.displayName),
+              style: const TextStyle(
+                fontSize: 28,
+                color: Colors.white,
+                fontWeight: FontWeight.bold,
+              ),
+            ),
+            Text(
+              widget.phoneNumber,
+              style: const TextStyle(fontSize: 18, color: Colors.white70),
+            ),
+            const SizedBox(height: 16),
+            const Text(
+              'Incoming Call',
+              style: TextStyle(fontSize: 20, color: Colors.white70),
+            ),
+            const Spacer(),
+            Padding(
+              padding: const EdgeInsets.only(bottom: 48.0),
+              child: Row(
+                mainAxisAlignment: MainAxisAlignment.spaceEvenly,
+                children: [
+                  _buildActionButton(
+                    icon: Icons.call_end,
+                    color: Colors.red,
+                    onPressed: _declineCall,
+                    label: 'Decline',
+                  ),
+                  _buildActionButton(
+                    icon: Icons.call,
+                    color: Colors.green,
+                    onPressed: _answerCall,
+                    label: 'Answer',
+                  ),
+                ],
+              ),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+  
+  Widget _buildActionButton({
+    required IconData icon,
+    required Color color,
+    required VoidCallback onPressed,
+    required String label,
+  }) {
+    return Column(
+      mainAxisSize: MainAxisSize.min,
+      children: [
+        GestureDetector(
+          onTap: onPressed,
+          child: Container(
+            padding: const EdgeInsets.all(16),
+            decoration: BoxDecoration(
+              color: color,
+              shape: BoxShape.circle,
+            ),
+            child: Icon(
+              icon,
+              color: Colors.white,
+              size: 32,
+            ),
+          ),
+        ),
+        const SizedBox(height: 8),
+        Text(
+          label,
+          style: const TextStyle(color: Colors.white),
+        ),
+      ],
+    );
+  }
+}

dialer/lib/presentation/features/composition/composition.dart

@@ -0,0 +1,335 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_contacts/flutter_contacts.dart';
+import 'package:url_launcher/url_launcher.dart';
+import '../../../domain/services/contact_service.dart';
+import '../../../domain/services/obfuscate_service.dart';
+import '../../../domain/services/call_service.dart';
+
+class CompositionPage extends StatefulWidget {
+  const CompositionPage({super.key});
+
+  @override
+  _CompositionPageState createState() => _CompositionPageState();
+}
+
+class _CompositionPageState extends State<CompositionPage> {
+  String dialedNumber = "";
+  List<Contact> _allContacts = [];
+  List<Contact> _filteredContacts = [];
+  final ContactService _contactService = ContactService();
+  final ObfuscateService _obfuscateService = ObfuscateService();
+  final CallService _callService = CallService();
+
+  @override
+  void initState() {
+    super.initState();
+    _fetchContacts();
+  }
+
+  Future<void> _fetchContacts() async {
+    _allContacts = await _contactService.fetchContacts();
+    _filteredContacts = _allContacts;
+    setState(() {});
+  }
+
+  void _filterContacts() {
+    setState(() {
+      _filteredContacts = _allContacts.where((contact) {
+        bool phoneMatch = contact.phones.any((phone) {
+          final rawPhoneNumber = phone.number;
+          final strippedPhoneNumber = rawPhoneNumber.replaceAll(RegExp(r'\D'), '');
+          final strippedDialedNumber = dialedNumber.replaceAll(RegExp(r'\D'), '');
+          return rawPhoneNumber.contains(dialedNumber) ||
+                 strippedPhoneNumber.contains(strippedDialedNumber);
+        });
+        final nameMatch = contact.displayName
+            .toLowerCase()
+            .contains(dialedNumber.toLowerCase());
+        return phoneMatch || nameMatch;
+      }).toList();
+    });
+  }
+
+  void _onNumberPress(String number) {
+    setState(() {
+      dialedNumber += number;
+      _filterContacts();
+    });
+  }
+
+  void _onPlusPress() {
+    setState(() {
+      dialedNumber += '+';
+      _filterContacts();
+    });
+  }
+
+  void _onDeletePress() {
+    setState(() {
+      if (dialedNumber.isNotEmpty) {
+        dialedNumber = dialedNumber.substring(0, dialedNumber.length - 1);
+        _filterContacts();
+      }
+    });
+  }
+
+  void _onClearPress() {
+    setState(() {
+      dialedNumber = "";
+      _filteredContacts = _allContacts;
+    });
+  }
+
+  void _makeCall(String phoneNumber) async {
+    try {
+      await _callService.makeGsmCall(context, phoneNumber: phoneNumber);
+      setState(() {
+        dialedNumber = phoneNumber;
+      });
+    } catch (e) {
+      debugPrint("Error making call: $e");
+      ScaffoldMessenger.of(context).showSnackBar(
+        SnackBar(content: Text('Failed to make call: $e')),
+      );
+    }
+  }
+
+  void _launchSms(String phoneNumber) async {
+    final uri = Uri(scheme: 'sms', path: phoneNumber);
+    if (await canLaunchUrl(uri)) {
+      await launchUrl(uri);
+    } else {
+      debugPrint('Could not send SMS to $phoneNumber');
+    }
+  }
+
+  void _addContact() async {
+    if (await FlutterContacts.requestPermission()) {
+      final newContact = Contact()
+        ..phones = [Phone(dialedNumber.isNotEmpty ? dialedNumber : '')];
+      final updatedContact = await FlutterContacts.openExternalInsert(newContact);
+      if (updatedContact != null) {
+        _fetchContacts();
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(content: Text('Contact added successfully!')),
+        );
+      }
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      backgroundColor: Colors.black,
+      body: Stack(
+        children: [
+          Column(
+            children: [
+              Expanded(
+                flex: 2,
+                child: Container(
+                  padding: const EdgeInsets.only(
+                      top: 42.0, left: 16.0, right: 16.0, bottom: 16.0),
+                  color: Colors.black,
+                  child: Column(
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    children: [
+                      Expanded(
+                        child: ListView(
+                          children: [
+                            ..._filteredContacts.map((contact) {
+                              final phoneNumber = contact.phones.isNotEmpty
+                                  ? contact.phones.first.number
+                                  : 'No phone number';
+                              return ListTile(
+                                title: Text(
+                                  _obfuscateService.obfuscateData(contact.displayName),
+                                  style: const TextStyle(color: Colors.white),
+                                ),
+                                subtitle: Text(
+                                  _obfuscateService.obfuscateData(phoneNumber),
+                                  style: const TextStyle(color: Colors.grey),
+                                ),
+                                trailing: Row(
+                                  mainAxisSize: MainAxisSize.min,
+                                  children: [
+                                    IconButton(
+                                      icon: Icon(Icons.phone, color: Colors.green[300], size: 20),
+                                      onPressed: () => _makeCall(phoneNumber),
+                                    ),
+                                    IconButton(
+                                      icon: Icon(Icons.message, color: Colors.blue[300], size: 20),
+                                      onPressed: () => _launchSms(phoneNumber),
+                                    ),
+                                  ],
+                                ),
+                                onTap: () {},
+                              );
+                            }).toList(),
+                            ListTile(
+                              title: const Text(
+                                'Add a contact',
+                                style: TextStyle(color: Colors.white),
+                              ),
+                              trailing: Icon(Icons.add, color: Colors.grey[600]),
+                              onTap: _addContact,
+                            ),
+                          ],
+                        ),
+                      ),
+                    ],
+                  ),
+                ),
+              ),
+              Expanded(
+                flex: 2,
+                child: Container(
+                  padding: const EdgeInsets.symmetric(horizontal: 16.0),
+                  child: Column(
+                    mainAxisAlignment: MainAxisAlignment.start,
+                    children: [
+                      Row(
+                        mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                        children: [
+                          Expanded(
+                            child: Align(
+                              alignment: Alignment.center,
+                              child: Text(
+                                dialedNumber,
+                                style: const TextStyle(fontSize: 24, color: Colors.white),
+                                overflow: TextOverflow.ellipsis,
+                              ),
+                            ),
+                          ),
+                          GestureDetector(
+                            onTap: _onDeletePress,
+                            onLongPress: _onClearPress,
+                            child: const Padding(
+                              padding: EdgeInsets.all(8.0),
+                              child: Icon(Icons.backspace, color: Colors.white),
+                            ),
+                          ),
+                        ],
+                      ),
+                      const SizedBox(height: 10),
+                      Expanded(
+                        child: SingleChildScrollView(
+                          child: Column(
+                            mainAxisAlignment: MainAxisAlignment.spaceEvenly,
+                            children: [
+                              Row(
+                                mainAxisAlignment: MainAxisAlignment.spaceEvenly,
+                                children: [
+                                  _buildDialButton('1', Colors.white),
+                                  _buildDialButton('2', Colors.white),
+                                  _buildDialButton('3', Colors.white),
+                                ],
+                              ),
+                              Row(
+                                mainAxisAlignment: MainAxisAlignment.spaceEvenly,
+                                children: [
+                                  _buildDialButton('4', Colors.white),
+                                  _buildDialButton('5', Colors.white),
+                                  _buildDialButton('6', Colors.white),
+                                ],
+                              ),
+                              Row(
+                                mainAxisAlignment: MainAxisAlignment.spaceEvenly,
+                                children: [
+                                  _buildDialButton('7', Colors.white),
+                                  _buildDialButton('8', Colors.white),
+                                  _buildDialButton('9', Colors.white),
+                                ],
+                              ),
+                              Row(
+                                mainAxisAlignment: MainAxisAlignment.spaceEvenly,
+                                children: [
+                                  _buildDialButton('*', const Color.fromRGBO(117, 117, 117, 1)),
+                                  _buildDialButtonWithPlus('0'),
+                                  _buildDialButton('#', const Color.fromRGBO(117, 117, 117, 1)),
+                                ],
+                              ),
+                            ],
+                          ),
+                        ),
+                      ),
+                    ],
+                  ),
+                ),
+              ),
+            ],
+          ),
+          Positioned(
+            bottom: 20.0,
+            left: 0,
+            right: 0,
+            child: Center(
+              child: ElevatedButton(
+                onPressed: dialedNumber.isNotEmpty ? () => _makeCall(dialedNumber) : null,
+                style: ElevatedButton.styleFrom(
+                  backgroundColor: Colors.green[700],
+                  shape: const CircleBorder(),
+                  padding: const EdgeInsets.all(20),
+                ),
+                child: const Icon(Icons.phone, color: Colors.white, size: 30),
+              ),
+            ),
+          ),
+          Positioned(
+            top: 40.0,
+            left: 16.0,
+            child: IconButton(
+              icon: const Icon(Icons.arrow_back, color: Colors.white),
+              onPressed: () => Navigator.pop(context),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+
+  Widget _buildDialButton(String number, Color textColor) {
+    return ElevatedButton(
+      onPressed: () => _onNumberPress(number),
+      style: ElevatedButton.styleFrom(
+        backgroundColor: Colors.black,
+        shape: const CircleBorder(),
+        padding: const EdgeInsets.all(16),
+      ),
+      child: Text(
+        number,
+        style: TextStyle(fontSize: 24, color: textColor),
+      ),
+    );
+  }
+
+  Widget _buildDialButtonWithPlus(String number) {
+    return Stack(
+      alignment: Alignment.center,
+      children: [
+        GestureDetector(
+          onLongPress: _onPlusPress,
+          child: ElevatedButton(
+            onPressed: () => _onNumberPress(number),
+            style: ElevatedButton.styleFrom(
+              backgroundColor: Colors.black,
+              shape: const CircleBorder(),
+              padding: const EdgeInsets.all(16),
+            ),
+            child: Text(
+              number,
+              style: const TextStyle(fontSize: 24, color: Colors.white),
+            ),
+          ),
+        ),
+        Positioned(
+          bottom: 8,
+          child: Text(
+            '+',
+            style: TextStyle(fontSize: 12, color: Colors.grey[600]),
+          ),
+        ),
+      ],
+    );
+  }
+}

dialer/lib/presentation/features/contacts/contact_page.dart

@@ -0,0 +1,20 @@
+import 'package:flutter/material.dart';
+import '../contacts/contact_state.dart';
+import '../contacts/widgets/alphabet_scroll_page.dart';
+
+class ContactPage extends StatelessWidget {
+  const ContactPage({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    final contactState = ContactState.of(context);
+    return Scaffold(
+      body: contactState.loading
+          ? const Center(child: CircularProgressIndicator())
+          : AlphabetScrollPage(
+              scrollOffset: contactState.scrollOffset,
+              contacts: contactState.contacts,
+            ),
+    );
+  }
+}

dialer/lib/presentation/features/contacts/contact_state.dart

@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_contacts/flutter_contacts.dart';
-import '../../services/contact_service.dart';
+import '../../../domain/services/contact_service.dart';
 
 class ContactState extends StatefulWidget {
   final Widget child;
@@ -23,7 +23,7 @@ class _ContactStateState extends State<ContactState> {
   List<Contact> _favoriteContacts = [];
   bool _loading = true;
   double _scrollOffset = 0.0;
-  Contact? _selfContact = Contact();
+  Contact? _selfContact;
 
   // Getters for all contacts and favorites
   List<Contact> get contacts => _allContacts;
@@ -35,11 +35,23 @@ class _ContactStateState extends State<ContactState> {
   @override
   void initState() {
     super.initState();
-    fetchContacts(); // Fetch all contacts by default
+    _initializeContacts(); // Rename to make it clear this is initialization
     FlutterContacts.addListener(_onContactChange);
   }
 
-  void _onContactChange() => fetchContacts();
+  // Private method to initialize contacts without setState during build
+  Future<void> _initializeContacts() async {
+    try {
+      List<Contact> contacts = await _contactService.fetchContacts();
+      _processContactsInitial(contacts);
+    } catch (e) {
+      debugPrint('Error fetching contacts: $e');
+    }
+  }
+
+  void _onContactChange() async {
+    await fetchContacts();
+  }
 
   @override
   void dispose() {
@@ -47,47 +59,92 @@ class _ContactStateState extends State<ContactState> {
     super.dispose();
   }
 
-  // Fetch all contacts
+  // Fetch all contacts - public method that can be called after build
   Future<void> fetchContacts() async {
+    if (!mounted) return;
+    
     setState(() => _loading = true);
     try {
       List<Contact> contacts = await _contactService.fetchContacts();
+      if (mounted) {
         _processContacts(contacts);
+      }
+    } catch (e) {
+      debugPrint('Error fetching contacts: $e');
     } finally {
+      if (mounted) {
         setState(() => _loading = false);
       }
     }
+  }
 
   // Fetch only favorite contacts
   Future<void> fetchFavoriteContacts() async {
+    if (!mounted) return;
+    
     setState(() => _loading = true);
     try {
       List<Contact> contacts = await _contactService.fetchFavoriteContacts();
+      if (mounted) {
         setState(() => _favoriteContacts = contacts);
+      }
+    } catch (e) {
+      debugPrint('Error fetching favorite contacts: $e');
     } finally {
+      if (mounted) {
         setState(() => _loading = false);
       }
     }
+  }
+
+  // Process contacts without setState for initial loading
+  void _processContactsInitial(List<Contact> contacts) {
+    if (!mounted) return;
+    
+    // Optimize by doing a single pass through contacts instead of multiple iterations
+    final filteredContacts = contacts.where((contact) => contact.phones.isNotEmpty).toList()
+      ..sort((a, b) => a.displayName.compareTo(b.displayName));
     
-  void _processContacts(List<Contact> contacts) {
     _selfContact = contacts.firstWhere(
       (contact) => contact.displayName.toLowerCase() == "user",
       orElse: () => Contact(),
     );
 
     if (_selfContact!.phones.isEmpty) {
-      debugPrint("Self contact has no phone numbers");
       _selfContact = null;
     }
     
-    contacts = contacts.where((contact) => contact.phones.isNotEmpty).toList();
-    contacts.sort((a, b) => a.displayName.compareTo(b.displayName));
+    _allContacts = filteredContacts;
+    _favoriteContacts = filteredContacts.where((contact) => contact.isStarred).toList();
+    _loading = false;
+    
+    // Force a rebuild after initialization is complete
+    if (mounted) {
+      WidgetsBinding.instance.addPostFrameCallback((_) {
+        setState(() {});
+      });
+    }
+  }
+
+  void _processContacts(List<Contact> contacts) {
+    if (!mounted) return;
+    
+    // Same optimization as above
+    final filteredContacts = contacts.where((contact) => contact.phones.isNotEmpty).toList()
+      ..sort((a, b) => a.displayName.compareTo(b.displayName));
+    
+    _selfContact = contacts.firstWhere(
+      (contact) => contact.displayName.toLowerCase() == "user",
+      orElse: () => Contact(),
+    );
+
+    if (_selfContact!.phones.isEmpty) {
+      _selfContact = null;
+    }
 
     setState(() {
-      _allContacts = contacts;
-      _favoriteContacts =
-          contacts.where((contact) => contact.isStarred).toList();
-      _selfContact = _selfContact;
+      _allContacts = filteredContacts;
+      _favoriteContacts = filteredContacts.where((contact) => contact.isStarred).toList();
     });
   }
 
@@ -102,25 +159,6 @@ class _ContactStateState extends State<ContactState> {
     });
   }
 
-  bool doesContactExist(Contact contact) {
-    // Example: consider it "existing" if there's a matching phone number
-    for (final existing in _allContacts) {
-      if (existing.toVCard() == contact.toVCard()) {
-        return true;
-      }
-      // for (final phone in existing.phones) {
-      //   for (final newPhone in contact.phones) {
-      //     // Simple exact match; you can do more advanced logic
-      //     if (phone.normalizedNumber == newPhone.normalizedNumber) {
-      //       return true;
-      //     }
-      //   }
-      // }  We might switch to finer and smarter logic later, ex: remove trailing spaces, capitals
-    }
-    return false;
-  }
-
-
   @override
   Widget build(BuildContext context) {
     return _InheritedContactState(
@@ -130,7 +168,6 @@ class _ContactStateState extends State<ContactState> {
   }
 }
 
-
 class _InheritedContactState extends InheritedWidget {
   final _ContactStateState data;
 

dialer/lib/presentation/features/contacts/widgets/add_contact_button.dart

@@ -1,6 +1,6 @@
-import 'package:dialer/widgets/qr_scanner.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_contacts/flutter_contacts.dart';
+import '../../../../domain/services/qr/qr_scanner.dart';
 
 class AddContactButton extends StatelessWidget {
   const AddContactButton({super.key});

dialer/lib/presentation/features/contacts/widgets/alphabet_scroll_page.dart

@@ -0,0 +1,232 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_contacts/flutter_contacts.dart';
+import '../../../../domain/services/obfuscate_service.dart';
+import 'package:dialer/presentation/common/widgets/username_color_generator.dart';
+import '../contact_state.dart';
+import 'add_contact_button.dart';
+import 'contact_modal.dart';
+import 'share_own_qr.dart';
+
+class AlphabetScrollPage extends StatefulWidget {
+  final double scrollOffset;
+  final List<Contact> contacts;
+
+  const AlphabetScrollPage({
+    super.key,
+    required this.scrollOffset,
+    required this.contacts,
+  });
+
+  @override
+  _AlphabetScrollPageState createState() => _AlphabetScrollPageState();
+}
+
+class _AlphabetScrollPageState extends State<AlphabetScrollPage> {
+  late ScrollController _scrollController;
+  final ObfuscateService _obfuscateService = ObfuscateService();
+  late Map<String, List<Contact>> _alphabetizedContacts;
+  late List<String> _alphabetKeys;
+
+  @override
+  void initState() {
+    super.initState();
+    _scrollController = ScrollController(initialScrollOffset: widget.scrollOffset);
+    _scrollController.addListener(_onScroll);
+    _organizeContacts();
+  }
+
+  @override
+  void didUpdateWidget(AlphabetScrollPage oldWidget) {
+    super.didUpdateWidget(oldWidget);
+    if (oldWidget.contacts != widget.contacts) {
+      _organizeContacts();
+    }
+  }
+
+  void _organizeContacts() {
+    _alphabetizedContacts = {};
+    for (var contact in widget.contacts) {
+      String firstLetter = contact.displayName.isNotEmpty
+          ? contact.displayName[0].toUpperCase()
+          : '#';
+      (_alphabetizedContacts[firstLetter] ??= []).add(contact);
+    }
+    _alphabetKeys = _alphabetizedContacts.keys.toList()..sort();
+  }
+
+  void _onScroll() {
+    final contactState = ContactState.of(context);
+    contactState.setScrollOffset(_scrollController.offset);
+  }
+
+  Future<void> _refreshContacts() async {
+    final contactState = ContactState.of(context);
+    try {
+      await contactState.fetchContacts();
+    } catch (e) {
+      debugPrint('Error refreshing contacts: $e');
+      ScaffoldMessenger.of(context).showSnackBar(
+        SnackBar(content: Text('Failed to refresh contacts')),
+      );
+    }
+  }
+
+  Future<void> _toggleFavorite(Contact contact) async {
+    try {
+      if (await FlutterContacts.requestPermission()) {
+        Contact? fullContact = await FlutterContacts.getContact(contact.id,
+            withProperties: true,
+            withAccounts: true,
+            withPhoto: true,
+            withThumbnail: true);
+
+        if (fullContact != null) {
+          fullContact.isStarred = !fullContact.isStarred;
+          await FlutterContacts.updateContact(fullContact);
+        }
+        
+        // Check if widget is still mounted before calling functions that use context
+        if (mounted) {
+          await _refreshContacts();
+        }
+      } else {
+        debugPrint("Could not fetch contact details");
+      }
+    } catch (e) {
+      debugPrint("Error updating favorite status: $e");
+      // Only show snackbar if still mounted
+      if (mounted) {
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(content: Text('Failed to update contact favorite status')),
+        );
+      }
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final selfContact = ContactState.of(context).selfContact;
+
+    return Scaffold(
+      backgroundColor: Colors.black,
+      body: Column(
+        children: [
+          // Top buttons row
+          Container(
+            color: Colors.black,
+            padding: const EdgeInsets.symmetric(horizontal: 16.0, vertical: 8.0),
+            child: Row(
+              mainAxisAlignment: MainAxisAlignment.spaceBetween,
+              children: [
+                AddContactButton(),
+                QRCodeButton(contacts: widget.contacts, selfContact: selfContact),
+              ],
+            ),
+          ),
+          // Contact List
+          Expanded(
+            child: ListView.builder(
+              controller: _scrollController,
+              itemCount: _alphabetKeys.length,
+              itemBuilder: (context, index) {
+                String letter = _alphabetKeys[index];
+                List<Contact> contactsForLetter = _alphabetizedContacts[letter]!;
+                return _buildLetterSection(letter, contactsForLetter);
+              },
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+
+  Widget _buildLetterSection(String letter, List<Contact> contactsForLetter) {
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        // Alphabet Letter Header
+        Padding(
+          padding: const EdgeInsets.symmetric(vertical: 8.0, horizontal: 16.0),
+          child: Text(
+            letter,
+            style: const TextStyle(
+              fontSize: 28,
+              fontWeight: FontWeight.bold,
+              color: Colors.white,
+            ),
+          ),
+        ),
+        // Contact Entries
+        ...contactsForLetter.map((contact) => _buildContactTile(contact)),
+      ],
+    );
+  }
+
+  Widget _buildContactTile(Contact contact) {
+    String phoneNumber = contact.phones.isNotEmpty
+        ? _obfuscateService.obfuscateData(contact.phones.first.number)
+        : 'No phone number';
+    Color avatarColor = generateColorFromName(contact.displayName);
+    
+    return ListTile(
+      leading: ObfuscatedAvatar(
+        imageBytes: contact.thumbnail,
+        radius: 25,
+        backgroundColor: avatarColor,
+        fallbackInitial: contact.displayName,
+      ),
+      title: Text(
+        _obfuscateService.obfuscateData(contact.displayName),
+        style: const TextStyle(color: Colors.white),
+      ),
+      subtitle: Text(
+        phoneNumber,
+        style: const TextStyle(color: Colors.white70),
+      ),
+      onTap: () => _showContactModal(contact),
+    );
+  }
+
+  void _showContactModal(Contact contact) {
+    showModalBottomSheet(
+      context: context,
+      isScrollControlled: true,
+      backgroundColor: Colors.transparent,
+      builder: (context) {
+        return ContactModal(
+          contact: contact,
+          onEdit: () => _onEditContact(contact),
+          onToggleFavorite: () => _toggleFavorite(contact),
+          isFavorite: contact.isStarred,
+        );
+      },
+    );
+  }
+
+  Future<void> _onEditContact(Contact contact) async {
+    if (await FlutterContacts.requestPermission()) {
+      final updatedContact = await FlutterContacts.openExternalEdit(contact.id);
+      if (updatedContact != null) {
+        await _refreshContacts();
+        Navigator.of(context).pop();
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(
+            content: Text('${contact.displayName} updated successfully!'),
+          ),
+        );
+      } else {
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(
+            content: Text('Edit canceled or failed.'),
+          ),
+        );
+      }
+    }
+  }
+
+  @override
+  void dispose() {
+    _scrollController.dispose();
+    super.dispose();
+  }
+}

dialer/lib/presentation/features/contacts/widgets/contact_modal.dart

@@ -0,0 +1,377 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_contacts/flutter_contacts.dart';
+import 'package:url_launcher/url_launcher.dart';
+import '../../../common/widgets/username_color_generator.dart';
+import '../../../common/widgets/color_darkener.dart';
+import '../../../../domain/services/obfuscate_service.dart';
+import '../../../../domain/services/block_service.dart';
+import '../../../../domain/services/contact_service.dart';
+import '../../../../domain/services/call_service.dart';
+
+class ContactModal extends StatefulWidget {
+  final Contact contact;
+  final Function onEdit;
+  final Function onToggleFavorite;
+  final bool isFavorite;
+
+  const ContactModal({
+    super.key,
+    required this.contact,
+    required this.onEdit,
+    required this.onToggleFavorite,
+    required this.isFavorite,
+  });
+
+  @override
+  _ContactModalState createState() => _ContactModalState();
+}
+
+class _ContactModalState extends State<ContactModal> {
+  late String phoneNumber;
+  bool isBlocked = false;
+  final ObfuscateService _obfuscateService = ObfuscateService();
+  final CallService _callService = CallService();
+  final ContactService _contactService = ContactService();
+
+  @override
+  void initState() {
+    super.initState();
+    phoneNumber = widget.contact.phones.isNotEmpty
+        ? widget.contact.phones.first.number
+        : 'No phone number';
+    _checkIfBlocked();
+  }
+
+  Future<void> _checkIfBlocked() async {
+    if (phoneNumber != 'No phone number') {
+      bool blocked = await BlockService().isNumberBlocked(phoneNumber);
+      if (mounted) {
+        setState(() {
+          isBlocked = blocked;
+        });
+      }
+    }
+  }
+
+  Future<void> _toggleBlockState() async {
+    if (phoneNumber == 'No phone number') {
+      ScaffoldMessenger.of(context).showSnackBar(
+        const SnackBar(content: Text('No phone number to block or unblock')),
+      );
+      return;
+    }
+
+    if (isBlocked) {
+      await BlockService().unblockNumber(phoneNumber);
+      if (mounted) {
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(content: Text('$phoneNumber has been unblocked')),
+        );
+      }
+    } else {
+      await BlockService().blockNumber(phoneNumber);
+      if (mounted) {
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(content: Text('$phoneNumber has been blocked')),
+        );
+      }
+    }
+
+    if (phoneNumber != 'No phone number' && mounted) {
+      _checkIfBlocked();
+    }
+
+    if (mounted) {
+      Navigator.of(context).pop();
+    }
+  }
+
+  void _launchSms(String phoneNumber) async {
+    final uri = Uri(scheme: 'sms', path: phoneNumber);
+    if (await canLaunchUrl(uri)) {
+      await launchUrl(uri);
+    } else {
+      debugPrint('Could not launch SMS to $phoneNumber');
+    }
+  }
+
+  void _launchEmail(String email) async {
+    final uri = Uri(scheme: 'mailto', path: email);
+    if (await canLaunchUrl(uri)) {
+      await launchUrl(uri);
+    } else {
+      debugPrint('Could not launch email to $email');
+    }
+  }
+
+  void _deleteContact() async {
+    final bool shouldDelete = await showDialog(
+      context: context,
+      builder: (context) => AlertDialog(
+        title: const Text('Delete Contact'),
+        content: Text(
+            'Are you sure you want to delete ${_obfuscateService.obfuscateData(widget.contact.displayName)}?'),
+        actions: [
+          TextButton(
+            onPressed: () => Navigator.of(context).pop(false),
+            child: const Text('Cancel'),
+          ),
+          TextButton(
+            onPressed: () => Navigator.of(context).pop(true),
+            child: const Text('Delete'),
+          ),
+        ],
+      ),
+    );
+
+    if (shouldDelete && mounted) {
+      try {
+        // Delete the contact
+        await FlutterContacts.deleteContact(widget.contact);
+
+        // Show success message
+        if (mounted) {
+          ScaffoldMessenger.of(context).showSnackBar(
+            SnackBar(
+                content: Text(
+                    '${_obfuscateService.obfuscateData(widget.contact.displayName)} deleted')),
+          );
+
+          // Close the modal
+          Navigator.of(context).pop();
+        }
+      } catch (e) {
+        // Handle errors and show a failure message
+        if (mounted) {
+          ScaffoldMessenger.of(context).showSnackBar(
+            SnackBar(
+                content:
+                    Text('Failed to delete ${widget.contact.displayName}: $e')),
+          );
+        }
+      }
+    }
+  }
+
+  void _shareContactAsQRCode() {
+    // Use the ContactService to show the QR code for the contact's vCard
+    _contactService.showContactQRCodeDialog(context, widget.contact);
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    String email = widget.contact.emails.isNotEmpty
+        ? _obfuscateService.obfuscateData(widget.contact.emails.first.address)
+        : 'No email';
+
+    final avatarColor = generateColorFromName(widget.contact.displayName);
+
+    return GestureDetector(
+      onTap: () => Navigator.of(context).pop(),
+      child: Container(
+        color: Colors.black.withOpacity(0.5),
+        child: GestureDetector(
+          onTap: () {},
+          child: FractionallySizedBox(
+            heightFactor: 0.8,
+            child: Container(
+              decoration: BoxDecoration(
+                color: Colors.grey[900],
+                borderRadius:
+                    const BorderRadius.vertical(top: Radius.circular(20)),
+              ),
+              child: Column(
+                mainAxisSize: MainAxisSize.min,
+                children: [
+                  // Modal Handle and Three-Dot Menu
+                  Stack(
+                    children: [
+                      Align(
+                        alignment: Alignment.center,
+                        child: Padding(
+                          padding: const EdgeInsets.symmetric(vertical: 10),
+                          child: Container(
+                            width: 50,
+                            height: 5,
+                            decoration: BoxDecoration(
+                              color: Colors.grey.shade300,
+                              borderRadius: BorderRadius.circular(5),
+                            ),
+                          ),
+                        ),
+                      ),
+                      Align(
+                        alignment: Alignment.topRight,
+                        child: Padding(
+                          padding: const EdgeInsets.only(top: 10, right: 10),
+                          child: PopupMenuButton<String>(
+                            icon: const Icon(Icons.more_vert,
+                                color: Colors.white),
+                            onSelected: (String choice) {
+                              if (choice == 'delete') {
+                                _deleteContact();
+                              } else if (choice == 'share') {
+                                _shareContactAsQRCode();
+                              }
+                              // Handle other choices if needed
+                            },
+                            itemBuilder: (BuildContext context) {
+                              return [
+                                const PopupMenuItem<String>(
+                                  value: 'delete',
+                                  child: Text('Delete'),
+                                ),
+                                const PopupMenuItem<String>(
+                                  value: 'share',
+                                  child: Text('Share (via QR code)'),
+                                ),
+                              ];
+                            },
+                          ),
+                        ),
+                      ),
+                    ],
+                  ),
+                  // Contact Profile
+                  Padding(
+                    padding: const EdgeInsets.all(16.0),
+                    child: Column(
+                      children: [
+                        widget.contact.thumbnail != null && widget.contact.thumbnail!.isNotEmpty
+                            ? ClipOval(
+                                child: Image.memory(
+                                  widget.contact.thumbnail!,
+                                  fit: BoxFit.cover,
+                                  width: 100,
+                                  height: 100,
+                                ),
+                              )
+                            : CircleAvatar(
+                                backgroundColor: avatarColor,
+                                radius: 50,
+                                child: Text(
+                                  widget.contact.displayName.isNotEmpty
+                                      ? widget.contact.displayName[0].toUpperCase()
+                                      : '?',
+                                  style: TextStyle(
+                                    color: darken(avatarColor),
+                                    fontSize: 40,
+                                  ),
+                                ),
+                              ),
+                        const SizedBox(height: 10),
+                        Text(
+                          _obfuscateService
+                              .obfuscateData(widget.contact.displayName),
+                          style: const TextStyle(
+                              fontSize: 24,
+                              fontWeight: FontWeight.bold,
+                              color: Colors.white),
+                        ),
+                      ],
+                    ),
+                  ),
+                  const Divider(color: Colors.grey),
+                  // Contact Actions
+                  Expanded(
+                    child: SingleChildScrollView(
+                      child: Column(
+                        children: [
+                          ListTile(
+                            leading: const Icon(Icons.phone, color: Colors.green),
+                            title: Text(
+                              _obfuscateService.obfuscateData(phoneNumber),
+                              style: const TextStyle(color: Colors.white),
+                            ),
+                            onTap: () async {
+                              if (widget.contact.phones.isNotEmpty) {
+                                await _callService.makeGsmCall(context,
+                                    phoneNumber: phoneNumber);
+                              }
+                            },
+                          ),
+                          ListTile(
+                            leading: const Icon(Icons.message, color: Colors.blue),
+                            title: Text(
+                              _obfuscateService.obfuscateData(phoneNumber),
+                              style: const TextStyle(color: Colors.white),
+                            ),
+                            onTap: () {
+                              if (widget.contact.phones.isNotEmpty) {
+                                _launchSms(phoneNumber);
+                              }
+                            },
+                          ),
+                          ListTile(
+                            leading: const Icon(Icons.email, color: Colors.orange),
+                            title: Text(
+                              email,
+                              style: const TextStyle(color: Colors.white),
+                            ),
+                            onTap: () {
+                              if (widget.contact.emails.isNotEmpty) {
+                                _launchEmail(email);
+                              }
+                            },
+                          ),
+                          const Divider(color: Colors.grey),
+                          // Favorite, Edit, and Block/Unblock Buttons
+                          Padding(
+                            padding: const EdgeInsets.symmetric(horizontal: 16.0),
+                            child: Column(
+                              children: [
+                                // Favorite button
+                                SizedBox(
+                                  width: double.infinity,
+                                  child: ElevatedButton.icon(
+                                    onPressed: () {
+                                      // First close the modal to avoid unmounted widget issues
+                                      Navigator.of(context).pop();
+                                      // Then toggle the favorite status
+                                      widget.onToggleFavorite();
+                                    },
+                                    icon: Icon(widget.isFavorite
+                                        ? Icons.star
+                                        : Icons.star_border),
+                                    label: Text(
+                                        widget.isFavorite ? 'Unfavorite' : 'Favorite'),
+                                  ),
+                                ),
+                                const SizedBox(height: 10),
+                                // Edit button
+                                SizedBox(
+                                  width: double.infinity,
+                                  child: ElevatedButton.icon(
+                                    onPressed: () => widget.onEdit(),
+                                    icon: const Icon(Icons.edit),
+                                    label: const Text('Edit Contact'),
+                                  ),
+                                ),
+                                const SizedBox(height: 10),
+                                // Block/Unblock button
+                                SizedBox(
+                                  width: double.infinity,
+                                  child: ElevatedButton.icon(
+                                    onPressed: _toggleBlockState,
+                                    icon: Icon(
+                                        isBlocked ? Icons.block : Icons.block_flipped),
+                                    label: Text(isBlocked ? 'Unblock' : 'Block'),
+                                  ),
+                                ),
+                              ],
+                            ),
+                          ),
+                          const SizedBox(height: 16),
+                        ],
+                      ),
+                    ),
+                  ),
+                ],
+              ),
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+}

dialer/lib/presentation/features/contacts/widgets/share_own_qr.dart

@@ -1,7 +1,7 @@
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_contacts/contact.dart';
-import 'package:dialer/services/contact_service.dart';
+import 'package:dialer/domain/services/contact_service.dart';
 
 class QRCodeButton extends StatelessWidget {
   final List<Contact> contacts;

dialer/lib/presentation/features/favorites/favorites_page.dart

@@ -0,0 +1,37 @@
+import 'package:flutter/material.dart';
+import '../contacts/contact_state.dart';
+import '../contacts/widgets/alphabet_scroll_page.dart';
+
+class FavoritesPage extends StatelessWidget {
+  const FavoritesPage({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    final contactState = ContactState.of(context);
+    
+    if (contactState.loading) {
+      return const Scaffold(
+        backgroundColor: Colors.black,
+        body: Center(child: CircularProgressIndicator()),
+      );
+    }
+    
+    final favorites = contactState.favoriteContacts;
+    
+    return Scaffold(
+      backgroundColor: Colors.black,
+      body: favorites.isEmpty
+          ? const Center(
+              child: Text(
+                'No favorites yet.\nStar your contacts to add them here.',
+                style: TextStyle(color: Colors.white60),
+                textAlign: TextAlign.center,
+              ),
+            )
+          : AlphabetScrollPage(
+              scrollOffset: contactState.scrollOffset,
+              contacts: favorites,
+            ),
+    );
+  }
+}

dialer/lib/presentation/features/history/history_page.dart

@@ -1,17 +1,17 @@
 import 'dart:async';
-import 'package:dialer/services/obfuscate_service.dart';
-import 'package:dialer/widgets/color_darkener.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_contacts/flutter_contacts.dart';
 import 'package:intl/intl.dart';
 import 'package:permission_handler/permission_handler.dart';
 import 'package:url_launcher/url_launcher.dart';
-import 'package:dialer/features/contacts/contact_state.dart';
-import 'package:dialer/widgets/username_color_generator.dart';
-import '../../services/block_service.dart';
+import '../../../domain/services/obfuscate_service.dart';
+import '../../common/widgets/color_darkener.dart';
+import '../../common/widgets/username_color_generator.dart';
+import '../../../domain/services/block_service.dart';
+import '../../../domain/services/call_service.dart';
+import '../contacts/contact_state.dart';
 import '../contacts/widgets/contact_modal.dart';
-import '../../services/call_service.dart';
 
 class History {
   final Contact contact;
@@ -19,6 +19,7 @@ class History {
   final String callType; // 'incoming' or 'outgoing'
   final String callStatus; // 'missed' or 'answered'
   final int attempts;
+  final String? simName; // Name of the SIM used for the call
 
   History(
     this.contact,
@@ -26,6 +27,7 @@ class History {
     this.callType,
     this.callStatus,
     this.attempts,
+    this.simName,
   );
 }
 
@@ -33,26 +35,90 @@ class HistoryPage extends StatefulWidget {
   const HistoryPage({Key? key}) : super(key: key);
 
   @override
-  _HistoryPageState createState() => _HistoryPageState();
+  HistoryPageState createState() => HistoryPageState();
 }
 
-class _HistoryPageState extends State<HistoryPage>
-    with SingleTickerProviderStateMixin {
-  List<History> histories = [];
-  bool loading = true;
+class HistoryPageState extends State<HistoryPage>
+    with AutomaticKeepAliveClientMixin, SingleTickerProviderStateMixin, WidgetsBindingObserver {
+  // Static histories list shared across all instances
+  static List<History> _globalHistories = [];
+  
+  // Getter to access the global histories list
+  List<History> get histories => _globalHistories;
+  
+  bool _isInitialLoad = true;
   int? _expandedIndex;
   final ObfuscateService _obfuscateService = ObfuscateService();
   final CallService _callService = CallService();
+  Timer? _debounceTimer;
 
   // Create a MethodChannel instance.
   static const MethodChannel _channel = MethodChannel('com.example.calllog');
   
+  // Static reference to the current instance for call-end notifications
+  static HistoryPageState? _currentInstance;
+  
+  // Global flag to track if history has been loaded once across all instances
+  static bool _hasLoadedInitialHistory = false;
+
+  @override
+  bool get wantKeepAlive => true; // Preserve state when switching pages
+
+  @override
+  void initState() {
+    super.initState();
+    WidgetsBinding.instance.addObserver(this);
+    _currentInstance = this; // Register this instance
+    
+    // Only load initial data if it hasn't been loaded before
+    if (!_hasLoadedInitialHistory) {
+      _buildHistories();
+    } else {
+      // If history was already loaded, just mark this instance as not doing initial load
+      _isInitialLoad = false;
+    }
+  }
+
+  /// Public method to trigger reload when page becomes visible
+  void triggerReload() {
+    // Disabled automatic reloading - only load once and add new entries via addNewCallToHistory
+    print("HistoryPage: triggerReload called but disabled to prevent full reload");
+  }
+
+  @override
+  void dispose() {
+    _debounceTimer?.cancel();
+    WidgetsBinding.instance.removeObserver(this);
+    if (_currentInstance == this) {
+      _currentInstance = null; // Unregister this instance
+    }
+    super.dispose();
+  }
+
+  /// Static method to add a new call to the history list
+  static void addNewCallToHistory() {
+    _currentInstance?._addLatestCallToHistory();
+  }
+  
+  /// Notify all instances to refresh UI when history changes
+  static void _notifyHistoryChanged() {
+    _currentInstance?.setState(() {
+      // Trigger UI rebuild for the current instance
+    });
+  }
+
+  @override
+  void didChangeAppLifecycleState(AppLifecycleState state) {
+    super.didChangeAppLifecycleState(state);
+    // Disabled automatic reloading when app comes to foreground
+    print("HistoryPage: didChangeAppLifecycleState called but disabled to prevent full reload");
+  }
+
   @override
   void didChangeDependencies() {
     super.didChangeDependencies();
-    if (loading) {
-      _buildHistories();
-    }
+    // didChangeDependencies is not reliable for TabBarView changes
+    // We'll use a different approach with RouteAware or manual detection
   }
 
   Future<void> _refreshContacts() async {
@@ -79,16 +145,21 @@ class _HistoryPageState extends State<HistoryPage>
           fullContact.isStarred = !fullContact.isStarred;
           await FlutterContacts.updateContact(fullContact);
         }
+        // Check if still mounted before accessing context
+        if (mounted) {
           await _refreshContacts();
+        }
       } else {
-        print("Could not fetch contact details");
+        debugPrint("Could not fetch contact details");
       }
     } catch (e) {
-      print("Error updating favorite status: $e");
+      debugPrint("Error updating favorite status: $e");
+      if (mounted) {
         ScaffoldMessenger.of(context).showSnackBar(
             SnackBar(content: Text('Failed to update favorite status')));
       }
     }
+  }
 
   /// Helper: Remove all non-digit characters for simple matching.
   String sanitizeNumber(String number) {
@@ -108,6 +179,22 @@ class _HistoryPageState extends State<HistoryPage>
     return null;
   }
 
+  /// Helper: Get SIM name from subscription ID
+  String? _getSimNameFromSubscriptionId(int? subscriptionId) {
+    if (subscriptionId == null) return null;
+    
+    // Map subscription IDs to SIM names
+    // These values might need to be adjusted based on your device
+    switch (subscriptionId) {
+      case 0:
+        return "SIM 1";
+      case 1:
+        return "SIM 2";
+      default:
+        return "SIM ${subscriptionId + 1}";
+    }
+  }
+
   /// Request permission for reading call logs.
   Future<bool> _requestCallLogPermission() async {
     var status = await Permission.phone.status;
@@ -122,10 +209,12 @@ class _HistoryPageState extends State<HistoryPage>
     // Request permission.
     bool hasPermission = await _requestCallLogPermission();
     if (!hasPermission) {
+      if (mounted) {
         ScaffoldMessenger.of(context).showSnackBar(
             const SnackBar(content: Text('Call log permission not granted')));
+      }
       setState(() {
-        loading = false;
+        _isInitialLoad = false;
       });
       return;
     }
@@ -149,9 +238,9 @@ class _HistoryPageState extends State<HistoryPage>
     List<Contact> contacts = contactState.contacts;
 
     List<History> callHistories = [];
-    // Process each log entry.
-    for (var entry in nativeLogs) {
-      // Each entry is a Map with keys: number, type, date, duration.
+    // Process each log entry with intermittent yields to avoid freezing.
+    for (int i = 0; i < nativeLogs.length; i++) {
+      final entry = nativeLogs[i];
       final String number = entry['number'] ?? '';
       if (number.isEmpty) continue;
 
@@ -195,17 +284,144 @@ class _HistoryPageState extends State<HistoryPage>
         );
       }
 
+      // Extract SIM information if available
+      String? simName;
+      if (entry.containsKey('sim_name') && entry['sim_name'] != null) {
+        simName = entry['sim_name'] as String;
+        print("DEBUG: Found sim_name: $simName for number: $number"); // Debug print
+      } else if (entry.containsKey('subscription_id')) {
+        final subId = entry['subscription_id'];
+        print("DEBUG: Found subscription_id: $subId for number: $number, but no sim_name"); // Debug print
+        simName = _getSimNameFromSubscriptionId(subId);
+        print("DEBUG: Mapped to SIM name: $simName"); // Debug print
+      } else {
+        print("DEBUG: No SIM info found for number: $number"); // Debug print
+      }
+
       callHistories
-          .add(History(matchedContact, callDate, callType, callStatus, 1));
+          .add(History(matchedContact, callDate, callType, callStatus, 1, simName));
+      // Yield every 10 iterations to avoid blocking the UI.
+      if (i % 10 == 0) await Future.delayed(Duration(milliseconds: 1));
     }
 
     // Sort histories by most recent.
     callHistories.sort((a, b) => b.date.compareTo(a.date));
 
+    if (mounted) {
       setState(() {
-      histories = callHistories;
-      loading = false;
+        _globalHistories = callHistories;
+        _isInitialLoad = false;
+        _hasLoadedInitialHistory = true; // Mark that history has been loaded once
       });
+      // Notify other instances about the initial load
+      _notifyHistoryChanged();
+    }
+  }
+
+  /// Add the latest call log entry to the history list
+  Future<void> _addLatestCallToHistory() async {
+    try {
+      // Get the latest call log entry
+      final dynamic rawEntry = await _channel.invokeMethod('getLatestCallLog');
+      
+      if (rawEntry == null) {
+        print("No latest call log entry found");
+        return;
+      }
+
+      // Convert to proper type - handle the method channel result properly
+      final Map<String, dynamic> latestEntry = Map<String, dynamic>.from(
+        (rawEntry as Map<Object?, Object?>).cast<String, dynamic>()
+      );
+
+      final String number = latestEntry['number'] ?? '';
+      if (number.isEmpty) return;
+
+      // Ensure contacts are loaded
+      final contactState = ContactState.of(context);
+      if (contactState.loading) {
+        await Future.doWhile(() async {
+          await Future.delayed(const Duration(milliseconds: 100));
+          return contactState.loading;
+        });
+      }
+      List<Contact> contacts = contactState.contacts;
+
+      // Convert timestamp to DateTime
+      DateTime callDate = DateTime.fromMillisecondsSinceEpoch(latestEntry['date'] ?? 0);
+
+      int typeInt = latestEntry['type'] ?? 0;
+      int duration = latestEntry['duration'] ?? 0;
+      String callType;
+      String callStatus;
+
+      // Map integer values to call type/status
+      switch (typeInt) {
+        case 1:
+          callType = "incoming";
+          callStatus = (duration == 0) ? "missed" : "answered";
+          break;
+        case 2:
+          callType = "outgoing";
+          callStatus = "answered";
+          break;
+        case 3:
+          callType = "incoming";
+          callStatus = "missed";
+          break;
+        default:
+          callType = "unknown";
+          callStatus = "unknown";
+      }
+
+      // Try to find a matching contact
+      Contact? matchedContact = findContactForNumber(number, contacts);
+      if (matchedContact == null) {
+        // Create a dummy contact if not found
+        matchedContact = Contact(
+          id: "dummy-$number",
+          displayName: number,
+          phones: [Phone(number)],
+        );
+      }
+
+      // Extract SIM information if available
+      String? simName;
+      if (latestEntry.containsKey('sim_name') && latestEntry['sim_name'] != null) {
+        simName = latestEntry['sim_name'] as String;
+        print("DEBUG: Found sim_name: $simName for number: $number");
+      } else if (latestEntry.containsKey('subscription_id')) {
+        final subId = latestEntry['subscription_id'];
+        print("DEBUG: Found subscription_id: $subId for number: $number, but no sim_name");
+        simName = _getSimNameFromSubscriptionId(subId);
+        print("DEBUG: Mapped to SIM name: $simName");
+      } else {
+        print("DEBUG: No SIM info found for number: $number");
+      }
+
+      // Create new history entry
+      History newHistory = History(matchedContact, callDate, callType, callStatus, 1, simName);
+
+      // Check if this call is already in the list (avoid duplicates)
+      bool alreadyExists = _globalHistories.any((history) =>
+          history.contact.phones.isNotEmpty &&
+          sanitizeNumber(history.contact.phones.first.number) == sanitizeNumber(number) &&
+          history.date.difference(callDate).abs().inSeconds < 5); // Within 5 seconds
+
+      if (!alreadyExists && mounted) {
+        setState(() {
+          // Insert at the beginning since it's the most recent
+          _globalHistories.insert(0, newHistory);
+        });
+        // Notify other instances about the change
+        _notifyHistoryChanged();
+        print("Added new call to history: $number at $callDate");
+      } else {
+        print("Call already exists in history or widget unmounted");
+      }
+    } catch (e) {
+      print("Error adding latest call to history: $e");
+    }
   }
 
   List _buildGroupedList(List<History> historyList) {
@@ -272,9 +488,10 @@ class _HistoryPageState extends State<HistoryPage>
 
   @override
   Widget build(BuildContext context) {
-    final contactState = ContactState.of(context);
+    super.build(context); // required due to AutomaticKeepAliveClientMixin
 
-    if (loading || contactState.loading) {
+    // Show loading only on initial load and if no data is available yet
+    if (_isInitialLoad && histories.isEmpty) {
       return Scaffold(
         backgroundColor: Colors.black,
         body: const Center(child: CircularProgressIndicator()),
@@ -402,10 +619,23 @@ class _HistoryPageState extends State<HistoryPage>
                   _obfuscateService.obfuscateData(contact.displayName),
                   style: const TextStyle(color: Colors.white),
                 ),
-                subtitle: Text(
+                subtitle: Column(
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: [
+                    Text(
                       DateFormat('MMM dd, hh:mm a').format(history.date),
                       style: const TextStyle(color: Colors.grey),
                     ),
+                    if (history.simName != null)
+                      Text(
+                        history.simName!,
+                        style: const TextStyle(
+                          color: Colors.blue,
+                          fontSize: 12,
+                        ),
+                      ),
+                  ],
+                ),
                 trailing: Row(
                   mainAxisSize: MainAxisSize.min,
                   children: [
@@ -419,7 +649,12 @@ class _HistoryPageState extends State<HistoryPage>
                       icon: const Icon(Icons.phone, color: Colors.green),
                       onPressed: () async {
                         if (contact.phones.isNotEmpty) {
-                          _callService.makeGsmCall(contact.phones.first.number);
+                          await _callService.makeGsmCall(
+                            context,
+                            phoneNumber: contact.phones.first.number,
+                            displayName: contact.displayName,
+                            thumbnail: contact.thumbnail,
+                          );
                         } else {
                           ScaffoldMessenger.of(context).showSnackBar(
                             const SnackBar(
@@ -609,6 +844,11 @@ class CallDetailsPage extends StatelessWidget {
               label: 'Attempts:',
               value: '${history.attempts}',
             ),
+            if (history.simName != null)
+              DetailRow(
+                label: 'SIM Used:',
+                value: history.simName!,
+              ),
             const SizedBox(height: 24),
             if (contact.phones.isNotEmpty)
               DetailRow(

dialer/lib/presentation/features/home/default_dialer_prompt.dart

@@ -0,0 +1,102 @@
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+
+class DefaultDialerPromptScreen extends StatelessWidget {
+  const DefaultDialerPromptScreen({super.key});
+
+  Future<void> _requestDefaultDialer(BuildContext context) async {
+    const channel = MethodChannel('call_service');
+    try {
+      await channel.invokeMethod('requestDefaultDialer');
+      // Navigate to home page after requesting default dialer
+      Navigator.of(context).pushReplacementNamed('/home');
+    } catch (e) {
+      ScaffoldMessenger.of(context).showSnackBar(
+        SnackBar(content: Text('Error requesting default dialer: $e')),
+      );
+    }
+  }
+
+  void _exploreApp(BuildContext context) {
+    // Navigate to home page without requesting default dialer
+    Navigator.of(context).pushReplacementNamed('/home');
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      backgroundColor: Colors.black,
+      body: SafeArea(
+        child: Padding(
+          padding: const EdgeInsets.all(16.0),
+          child: Column(
+            mainAxisAlignment: MainAxisAlignment.spaceBetween,
+            children: [
+              Expanded(
+                child: Column(
+                  mainAxisAlignment: MainAxisAlignment.center,
+                  children: [
+                    Text(
+                      'Set as Default Dialer',
+                      style: TextStyle(
+                        fontSize: 24,
+                        fontWeight: FontWeight.bold,
+                        color: Colors.white,
+                      ),
+                      textAlign: TextAlign.center,
+                    ),
+                    SizedBox(height: 16),
+                    Text(
+                      'To handle calls effectively, Icing needs to be your default dialer app. This allows Icing to manage incoming and outgoing calls seamlessly.\n\nWithout the permission, Icing will not be able to encrypt calls.',
+                      style: TextStyle(
+                        fontSize: 16,
+                        color: Colors.white70,
+                      ),
+                      textAlign: TextAlign.center,
+                    ),
+                  ],
+                ),
+              ),
+              Row(
+                children: [
+                  Expanded(
+                    flex: 1,
+                    child: Padding(
+                      padding: const EdgeInsets.only(right: 8.0),
+                      child: ElevatedButton(
+                        onPressed: () => _exploreApp(context),
+                        style: ElevatedButton.styleFrom(
+                          backgroundColor: Colors.grey[800],
+                          foregroundColor: Colors.white,
+                          padding: EdgeInsets.symmetric(
+                              horizontal: 16, vertical: 12),
+                        ),
+                        child: Text('Explore App first'),
+                      ),
+                    ),
+                  ),
+                  Expanded(
+                    flex: 1,
+                    child: Padding(
+                      padding: const EdgeInsets.only(left: 8.0),
+                      child: ElevatedButton(
+                        onPressed: () => _requestDefaultDialer(context),
+                        style: ElevatedButton.styleFrom(
+                          backgroundColor: Colors.blue,
+                          foregroundColor: Colors.white,
+                          padding: EdgeInsets.symmetric(
+                              horizontal: 16, vertical: 12),
+                        ),
+                        child: Text('Set as Default Dialer'),
+                      ),
+                    ),
+                  ),
+                ],
+              ),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+}

dialer/lib/presentation/features/home/home_page.dart

@@ -1,63 +1,92 @@
-import 'package:dialer/services/obfuscate_service.dart';
 import 'package:flutter/material.dart';
-import 'package:dialer/features/contacts/contact_page.dart';
-import 'package:dialer/features/favorites/favorites_page.dart';
-import 'package:dialer/features/history/history_page.dart';
-import 'package:dialer/features/composition/composition.dart';
-import 'package:flutter_contacts/flutter_contacts.dart';
-import 'package:dialer/features/settings/settings.dart';
-import '../../services/contact_service.dart';
-import 'package:dialer/features/voicemail/voicemail_page.dart';
+import '../../../domain/services/obfuscate_service.dart';
+import '../contacts/contact_page.dart';
+import '../favorites/favorites_page.dart';
+import '../history/history_page.dart';
+import '../composition/composition.dart';
+import '../settings/settings.dart';
+import '../voicemail/voicemail_page.dart';
 import '../contacts/widgets/contact_modal.dart';
-import 'package:dialer/features/accessibility/accessibility.dart';  // Add this import
+import 'package:flutter_contacts/flutter_contacts.dart';
+import 'package:dialer/domain/services/contact_service.dart';
 
-
-class _MyHomePageState extends State<MyHomePage>
-    with SingleTickerProviderStateMixin {
+class _MyHomePageState extends State<MyHomePage> with SingleTickerProviderStateMixin {
   late TabController _tabController;
   List<Contact> _allContacts = [];
   List<Contact> _contactSuggestions = [];
   final ContactService _contactService = ContactService();
   final ObfuscateService _obfuscateService = ObfuscateService();
   final TextEditingController _searchController = TextEditingController();
-
+  late SearchController _searchBarController;
+  String _rawSearchInput = '';
+  final GlobalKey<HistoryPageState> _historyPageKey = GlobalKey<HistoryPageState>();
 
   @override
   void initState() {
     super.initState();
-    // Set the TabController length to 4
-    _tabController = TabController(length: 4, vsync: this, initialIndex: 1);
+    _tabController = TabController(length: 4, vsync: this, initialIndex: 2);
     _tabController.addListener(_handleTabIndex);
+    _searchBarController = SearchController();
+    _searchBarController.addListener(() {
+      if (_searchController.text != _searchBarController.text) {
+        _rawSearchInput = _searchBarController.text;
+        _searchController.text = _rawSearchInput;
+        _onSearchChanged(_searchBarController.text);
+      }
+    });
     _fetchContacts();
   }
 
   void _fetchContacts() async {
     _allContacts = await _contactService.fetchContacts();
-    setState(() {});
+    _contactSuggestions = List.from(_allContacts);
+    if (mounted) setState(() {});
   }
 
   void _clearSearch() {
     _searchController.clear();
+    _searchBarController.clear();
+    _rawSearchInput = '';
     _onSearchChanged('');
   }
 
   void _onSearchChanged(String query) {
     setState(() {
       if (query.isEmpty) {
-        _contactSuggestions = List.from(_allContacts); // Reset suggestions
+        _contactSuggestions = List.from(_allContacts);
       } else {
+        final normalizedQuery = _normalizeString(query.toLowerCase());
         _contactSuggestions = _allContacts.where((contact) {
-          return contact.displayName
-              .toLowerCase()
-              .contains(query.toLowerCase());
+          final normalizedName = _normalizeString(contact.displayName.toLowerCase());
+          return normalizedName.contains(normalizedQuery);
         }).toList();
       }
     });
   }
 
+  String _normalizeString(String input) {
+    const accentMap = {
+      'àáâãäå': 'a',
+      'èéêë': 'e',
+      'ìíîï': 'i',
+      'òóôõö': 'o',
+      'ùúûü': 'u',
+      'ç': 'c',
+      'ñ': 'n',
+    };
+    String normalized = input;
+    accentMap.forEach((accents, base) {
+      for (var accent in accents.split('')) {
+        normalized = normalized.replaceAll(accent, base);
+      }
+    });
+    return normalized;
+  }
+
   @override
   void dispose() {
     _searchController.dispose();
+    _searchBarController.dispose();
     _tabController.removeListener(_handleTabIndex);
     _tabController.dispose();
     super.dispose();
@@ -65,24 +94,27 @@ class _MyHomePageState extends State<MyHomePage>
 
   void _handleTabIndex() {
     setState(() {});
+    // Trigger history page reload when switching to history tab (index 1)
+    if (_tabController.index == 1) {
+      _historyPageKey.currentState?.triggerReload();
+    }
   }
 
   void _toggleFavorite(Contact contact) async {
     try {
       if (await FlutterContacts.requestPermission()) {
-        Contact? fullContact = await FlutterContacts.getContact(contact.id,
+        Contact? fullContact = await FlutterContacts.getContact(
+          contact.id,
           withProperties: true,
           withAccounts: true,
           withPhoto: true,
-            withThumbnail: true);
+          withThumbnail: true,
+        );
 
         if (fullContact != null) {
           fullContact.isStarred = !fullContact.isStarred;
           await FlutterContacts.updateContact(fullContact);
-          setState(() {
-            // Updating the contact list after toggling the favorite
           _fetchContacts();
-          });
         }
       } else {
         print("Could not fetch contact details");
@@ -101,7 +133,6 @@ class _MyHomePageState extends State<MyHomePage>
       backgroundColor: Colors.black,
       body: Column(
         children: [
-          // Persistent Search Bar
           Padding(
             padding: const EdgeInsets.only(
               top: 24.0,
@@ -119,35 +150,33 @@ class _MyHomePageState extends State<MyHomePage>
                       border: Border.all(color: Colors.grey.shade800, width: 1),
                     ),
                     child: SearchAnchor(
-                      builder:
-                          (BuildContext context, SearchController controller) {
+                      searchController: _searchBarController,
+                      builder: (BuildContext context, SearchController controller) {
                         return GestureDetector(
                           onTap: () {
-                            controller.openView(); // Open the search view
+                            controller.openView();
                           },
                           child: Container(
                             decoration: BoxDecoration(
                               color: const Color.fromARGB(255, 30, 30, 30),
                               borderRadius: BorderRadius.circular(12.0),
-                              border: Border.all(
-                                  color: Colors.grey.shade800, width: 1),
+                              border: Border.all(color: Colors.grey.shade800, width: 1),
                             ),
-                            padding: const EdgeInsets.symmetric(
-                                vertical: 12.0, horizontal: 16.0),
+                            padding: const EdgeInsets.symmetric(vertical: 12.0, horizontal: 16.0),
                             child: Row(
                               children: [
-                                const Icon(Icons.search,
-                                    color: Colors.grey, size: 24.0),
+                                const Icon(Icons.search, color: Colors.grey, size: 24.0),
                                 const SizedBox(width: 8.0),
-                                Text(
-                                  _searchController.text.isEmpty
+                                Expanded(
+                                  child: Text(
+                                    _rawSearchInput.isEmpty
                                         ? 'Search contacts'
-                                      : _searchController.text,
-                                  style: const TextStyle(
-                                      color: Colors.grey, fontSize: 16.0),
+                                        : _rawSearchInput,
+                                    style: const TextStyle(color: Colors.grey, fontSize: 16.0),
+                                    overflow: TextOverflow.ellipsis,
                                   ),
-                                const Spacer(),
-                                if (_searchController.text.isNotEmpty)
+                                ),
+                                if (_rawSearchInput.isNotEmpty)
                                   GestureDetector(
                                     onTap: _clearSearch,
                                     child: const Icon(
@@ -162,23 +191,24 @@ class _MyHomePageState extends State<MyHomePage>
                         );
                       },
                       viewOnChanged: (query) {
-                        _onSearchChanged(query); // Update immediately
+
+                        if (_searchBarController.text != query) {
+                          _rawSearchInput = query;
+                          _searchBarController.text = query;
+                          _searchController.text = query;
+                        }
+                        _onSearchChanged(query);
                       },
-                      suggestionsBuilder:
-                          (BuildContext context, SearchController controller) {
+                      suggestionsBuilder: (BuildContext context, SearchController controller) {
                         return _contactSuggestions.map((contact) {
                           return ListTile(
                             key: ValueKey(contact.id),
-                            title: Text(_obfuscateService.obfuscateData(contact.displayName),
-                                style: const TextStyle(color: Colors.white)),
+                            title: Text(
+                              _obfuscateService.obfuscateData(contact.displayName),
+                              style: const TextStyle(color: Colors.white),
+                            ),
                             onTap: () {
-                              // Clear the search text input
-                              controller.text = '';
-
-                              // Close the search view
                               controller.closeView(contact.displayName);
-
-                              // Show the ContactModal when a contact is tapped
                               showModalBottomSheet(
                                 context: context,
                                 isScrollControlled: true,
@@ -187,34 +217,28 @@ class _MyHomePageState extends State<MyHomePage>
                                   return ContactModal(
                                     contact: contact,
                                     onEdit: () async {
-                                      if (await FlutterContacts
-                                          .requestPermission()) {
-                                        final updatedContact =
-                                            await FlutterContacts
+                                      if (await FlutterContacts.requestPermission()) {
+                                        final updatedContact = await FlutterContacts
                                             .openExternalEdit(contact.id);
                                         if (updatedContact != null) {
                                           _fetchContacts();
                                           Navigator.of(context).pop();
-                                          ScaffoldMessenger.of(context)
-                                              .showSnackBar(
+                                          ScaffoldMessenger.of(context).showSnackBar(
                                             SnackBar(
                                               content: Text(
                                                   '${contact.displayName} updated successfully!'),
                                             ),
                                           );
                                         } else {
-                                          ScaffoldMessenger.of(context)
-                                              .showSnackBar(
+                                          ScaffoldMessenger.of(context).showSnackBar(
                                             SnackBar(
-                                              content: Text(
-                                                  'Edit canceled or failed.'),
+                                              content: Text('Edit canceled or failed.'),
                                             ),
                                           );
                                         }
                                       }
                                     },
-                                    onToggleFavorite: () =>
-                                        _toggleFavorite(contact),
+                                    onToggleFavorite: () => _toggleFavorite(contact),
                                     isFavorite: contact.isStarred,
                                   );
                                 },
@@ -226,7 +250,6 @@ class _MyHomePageState extends State<MyHomePage>
                     ),
                   ),
                 ),
-                // 3-dot menu
                 PopupMenuButton<String>(
                   icon: const Icon(Icons.more_vert, color: Colors.white),
                   itemBuilder: (BuildContext context) => [
@@ -234,23 +257,12 @@ class _MyHomePageState extends State<MyHomePage>
                       value: 'settings',
                       child: Text('Settings'),
                     ),
-                    const PopupMenuItem<String>(
-                      value: 'accessibility',
-                      child: Text('Accessibility'),
-                    ),
                   ],
                   onSelected: (String value) {
                     if (value == 'settings') {
                       Navigator.push(
                         context,
-                        MaterialPageRoute(
-                            builder: (context) => const SettingsPage()),
-                      );
-                    } else if (value == 'accessibility') {
-                      Navigator.push(
-                        context,
-                        MaterialPageRoute(
-                            builder: (context) => const AccessibilityPage()),
+                        MaterialPageRoute(builder: (context) => const SettingsPage()),
                       );
                     }
                   },
@@ -258,17 +270,16 @@ class _MyHomePageState extends State<MyHomePage>
               ],
             ),
           ),
-          // Main content with TabBarView
           Expanded(
             child: Stack(
               children: [
                 TabBarView(
                   controller: _tabController,
-                  children: const [
-                    FavoritesPage(),
-                    HistoryPage(),
-                    ContactPage(),
-                    VoicemailPage(),
+                  children: [
+                    const FavoritesPage(),
+                    HistoryPage(key: _historyPageKey),
+                    const ContactPage(),
+                    const VoicemailPage(),
                   ],
                 ),
                 Positioned(

dialer/lib/presentation/features/settings/call/settings_call.dart

@@ -77,7 +77,7 @@ class _SettingsCallPageState extends State<SettingsCallPage> {
               },
               child: const Text('Beep'),
             ),
-            // Add more ringtone options
+            // ...existing options...
           ],
         );
       },

dialer/lib/presentation/features/settings/call/settings_call_page.dart

@@ -0,0 +1,32 @@
+import 'package:flutter/material.dart';
+
+/// Calling settings configuration page
+class SettingsCallPage extends StatelessWidget {
+  const SettingsCallPage({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      backgroundColor: Colors.black,
+      appBar: AppBar(
+        title: const Text('Call Settings'),
+      ),
+      body: ListView(
+        children: const [
+          ListTile(
+            title: Text('Call Forwarding', style: TextStyle(color: Colors.white)),
+            subtitle: Text('Manage call forwarding options', style: TextStyle(color: Colors.grey)),
+          ),
+          ListTile(
+            title: Text('Call Waiting', style: TextStyle(color: Colors.white)),
+            subtitle: Text('Enable or disable call waiting', style: TextStyle(color: Colors.grey)),
+          ),
+          ListTile(
+            title: Text('Caller ID', style: TextStyle(color: Colors.white)),
+            subtitle: Text('Manage your caller ID settings', style: TextStyle(color: Colors.grey)),
+          ),
+        ],
+      ),
+    );
+  }
+}

dialer/lib/presentation/features/settings/cryptography/key_management.dart

@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:dialer/services/cryptography/asymmetric_crypto_service.dart';
+import 'package:dialer/domain/services/cryptography/asymmetric_crypto_service.dart';
 
 class ManageKeysPage extends StatefulWidget {
   const ManageKeysPage({Key? key}) : super(key: key);

dialer/lib/presentation/features/settings/settings.dart

@@ -1,10 +1,8 @@
-// settings.dart
-
 import 'package:flutter/material.dart';
-import 'package:dialer/features/settings/call/settingsCall.dart';
-// import 'package:dialer/features/settings/cryptography/';
-import 'package:dialer/features/settings/blocked/settings_blocked.dart';
-import 'cryptography/key_management.dart';
+import 'package:dialer/presentation/features/settings/call/settings_call.dart';
+import 'package:dialer/presentation/features/settings/cryptography/key_management.dart';
+import 'package:dialer/presentation/features/settings/blocked/settings_blocked.dart';
+import 'package:dialer/presentation/features/settings/sim/settings_sim.dart';
 
 class SettingsPage extends StatelessWidget {
   const SettingsPage({super.key});
@@ -29,6 +27,12 @@ class SettingsPage extends StatelessWidget {
           MaterialPageRoute(builder: (context) => const BlockedNumbersPage()),
         );
         break;
+      case 'Default SIM':
+        Navigator.push(
+          context,
+          MaterialPageRoute(builder: (context) => const SettingsSimPage()),
+        );
+        break;
       // Add more cases for other settings pages
       default:
         // Handle default or unknown settings
@@ -41,7 +45,8 @@ class SettingsPage extends StatelessWidget {
     final settingsOptions = [
       'Calling settings',
       'Key management',
-      'Blocked numbers'
+      'Blocked numbers',
+      'Default SIM',
     ];
 
     return Scaffold(

dialer/lib/presentation/features/settings/sim/settings_sim.dart

@@ -0,0 +1,220 @@
+import 'package:flutter/material.dart';
+import 'package:shared_preferences/shared_preferences.dart';
+import 'package:sim_data_new/sim_data.dart';
+
+class SettingsSimPage extends StatefulWidget {
+  const SettingsSimPage({super.key});
+
+  @override
+  _SettingsSimPageState createState() => _SettingsSimPageState();
+}
+
+class _SettingsSimPageState extends State<SettingsSimPage> {
+  int _selectedSim = 0;
+  SimData? _simData;
+  bool _isLoading = true;
+  String? _error;
+
+  @override
+  void initState() {
+    super.initState();
+    _loadSimCards();
+    _loadDefaultSim();
+  }
+
+  void _loadSimCards() async {
+    try {
+      final simData = await SimDataPlugin.getSimData();
+      setState(() {
+        _simData = simData;
+        _isLoading = false;
+        _error = null;
+      });
+    } catch (e) {
+      setState(() {
+        _isLoading = false;
+        _error = e.toString();
+      });
+      print('Error loading SIM cards: $e');
+    }
+  }
+
+  void _loadDefaultSim() async {
+    final prefs = await SharedPreferences.getInstance();
+    setState(() {
+      _selectedSim = prefs.getInt('default_sim_slot') ?? 0;
+    });
+  }
+
+  void _onSimChanged(int? value) async {
+    if (value != null) {
+      final prefs = await SharedPreferences.getInstance();
+      await prefs.setInt('default_sim_slot', value);
+      setState(() {
+        _selectedSim = value;
+      });
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      backgroundColor: Colors.black,
+      appBar: AppBar(
+        title: const Text('Default SIM'),
+      ),
+      body: _buildBody(),
+    );
+  }
+
+  Widget _buildBody() {
+    if (_isLoading) {
+      return const Center(
+        child: CircularProgressIndicator(
+          color: Colors.blue,
+        ),
+      );
+    }
+
+    if (_error != null) {
+      return Center(
+        child: Column(
+          mainAxisAlignment: MainAxisAlignment.center,
+          children: [
+            const Icon(
+              Icons.error_outline,
+              color: Colors.red,
+              size: 64,
+            ),
+            const SizedBox(height: 16),
+            Text(
+              'Error loading SIM cards',
+              style: const TextStyle(color: Colors.white, fontSize: 18),
+            ),
+            const SizedBox(height: 8),
+            Text(
+              _error!,
+              style: const TextStyle(color: Colors.grey, fontSize: 14),
+              textAlign: TextAlign.center,
+            ),
+            const SizedBox(height: 16),
+            ElevatedButton(
+              onPressed: () {
+                setState(() {
+                  _isLoading = true;
+                  _error = null;
+                });
+                _loadSimCards();
+              },
+              child: const Text('Retry'),
+            ),
+            const SizedBox(height: 16),
+            Text(
+              'Fallback to default options:',
+              style: const TextStyle(color: Colors.grey, fontSize: 14),
+            ),
+            const SizedBox(height: 8),
+            _buildFallbackSimList(),
+          ],
+        ),
+      );
+    }
+
+    if (_simData == null || _simData!.cards.isEmpty) {
+      return Center(
+        child: Column(
+          mainAxisAlignment: MainAxisAlignment.center,
+          children: [
+            const Icon(
+              Icons.sim_card_alert,
+              color: Colors.orange,
+              size: 64,
+            ),
+            const SizedBox(height: 16),
+            const Text(
+              'No SIM cards detected',
+              style: TextStyle(color: Colors.white, fontSize: 18),
+            ),
+            const SizedBox(height: 8),
+            const Text(
+              'Using default options:',
+              style: TextStyle(color: Colors.grey, fontSize: 14),
+            ),
+            const SizedBox(height: 16),
+            _buildFallbackSimList(),
+          ],
+        ),
+      );
+    }
+
+    return ListView.builder(
+      itemCount: _simData!.cards.length,
+      itemBuilder: (context, index) {
+        final card = _simData!.cards[index];
+        return RadioListTile<int>(
+          title: Text(
+            _getSimDisplayName(card, index),
+            style: const TextStyle(color: Colors.white),
+          ),
+          subtitle: Text(
+            _getSimSubtitle(card),
+            style: const TextStyle(color: Colors.grey),
+          ),
+          value: card.slotIndex,
+          groupValue: _selectedSim,
+          onChanged: _onSimChanged,
+          activeColor: Colors.blue,
+        );
+      },
+    );
+  }
+
+  Widget _buildFallbackSimList() {
+    return Column(
+      children: [
+        RadioListTile<int>(
+          title: const Text('SIM 1', style: TextStyle(color: Colors.white)),
+          value: 0,
+          groupValue: _selectedSim,
+          onChanged: _onSimChanged,
+          activeColor: Colors.blue,
+        ),
+        RadioListTile<int>(
+          title: const Text('SIM 2', style: TextStyle(color: Colors.white)),
+          value: 1,
+          groupValue: _selectedSim,
+          onChanged: _onSimChanged,
+          activeColor: Colors.blue,
+        ),
+      ],
+    );
+  }
+
+  String _getSimDisplayName(dynamic card, int index) {
+    if (card.displayName != null && card.displayName.isNotEmpty) {
+      return card.displayName;
+    }
+    if (card.carrierName != null && card.carrierName.isNotEmpty) {
+      return card.carrierName;
+    }
+    return 'SIM ${index + 1}';
+  }
+
+  String _getSimSubtitle(dynamic card) {
+    List<String> subtitleParts = [];
+
+    if (card.phoneNumber != null && card.phoneNumber.isNotEmpty) {
+      subtitleParts.add(card.phoneNumber);
+    }
+
+    if (card.carrierName != null && card.carrierName.isNotEmpty) {
+      subtitleParts.add(card.carrierName);
+    }
+
+    if (subtitleParts.isEmpty) {
+      subtitleParts.add('Slot ${card.slotIndex}');
+    }
+
+    return subtitleParts.join(' • ');
+  }
+}

dialer/lib/presentation/features/voicemail/voicemail_page.dart

@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:audioplayers/audioplayers.dart';
 
 class VoicemailPage extends StatefulWidget {
-  const VoicemailPage({Key? key}) : super(key: key);
+  const VoicemailPage({super.key});
 
   @override
   State<VoicemailPage> createState() => _VoicemailPageState();
@@ -14,6 +14,7 @@ class _VoicemailPageState extends State<VoicemailPage> {
   Duration _duration = Duration.zero;
   Duration _position = Duration.zero;
   late AudioPlayer _audioPlayer;
+  bool _loading = false;
 
   @override
   void initState() {
@@ -50,12 +51,12 @@ class _VoicemailPageState extends State<VoicemailPage> {
 
   @override
   Widget build(BuildContext context) {
+    if (_loading) {
+      return const Center(child: CircularProgressIndicator());
+    }
+
     return Scaffold(
       backgroundColor: Colors.black,
-      // appBar: AppBar(
-      //   // title: const Text('Voicemail'),
-      //   backgroundColor: Colors.black,
-      // ),
       body: ListView(
         children: [
           GestureDetector(

dialer/lib/services/block_service.dart

@@ -1,52 +0,0 @@
-import 'package:shared_preferences/shared_preferences.dart';
-
-class BlockService {
-  static final BlockService _instance = BlockService._internal();
-
-  factory BlockService() {
-    return _instance;
-  }
-
-  BlockService._internal();
-
-  // Function to add a number to the blocked list
-  Future<void> blockNumber(String number) async {
-    if (number.isEmpty) return;
-
-    final prefs = await SharedPreferences.getInstance();
-    List<String> blockedNumbers = prefs.getStringList('blockedNumbers') ?? [];
-
-    if (!blockedNumbers.contains(number)) {
-      blockedNumbers.add(number);
-      await prefs.setStringList('blockedNumbers', blockedNumbers);
-      print('$number has been blocked');
-    } else {
-      print('$number is already blocked');
-    }
-  }
-
-  // Function to remove a number from the blocked list
-  Future<void> unblockNumber(String number) async {
-    if (number.isEmpty) return;
-
-    final prefs = await SharedPreferences.getInstance();
-    List<String> blockedNumbers = prefs.getStringList('blockedNumbers') ?? [];
-
-    if (blockedNumbers.contains(number)) {
-      blockedNumbers.remove(number);
-      await prefs.setStringList('blockedNumbers', blockedNumbers);
-      print('$number has been unblocked');
-    } else {
-      print('$number is not blocked');
-    }
-  }
-
-  // Check if a number is blocked
-  Future<bool> isNumberBlocked(String number) async {
-    if (number.isEmpty) return false;
-
-    final prefs = await SharedPreferences.getInstance();
-    List<String> blockedNumbers = prefs.getStringList('blockedNumbers') ?? [];
-    return blockedNumbers.contains(number);
-  }
-}

dialer/lib/services/call_service.dart

@@ -1,26 +0,0 @@
-import 'package:flutter/services.dart';
-
-// Service to manage call-related operations
-class CallService {
-  static const MethodChannel _channel = MethodChannel('call_service');
-
-  // Function to make a GSM call
-  Future<void> makeGsmCall(String phoneNumber) async {
-    try {
-      await _channel.invokeMethod('makeGsmCall', {"phoneNumber": phoneNumber});
-    } catch (e) {
-      print("Error making call: $e");
-      rethrow;
-    }
-  }
-
-  // Function to hang up the current call
-  Future<void> hangUpCall() async {
-    try {
-      await _channel.invokeMethod('hangUpCall');
-    } catch (e) {
-      print("Error hanging up call: $e");
-      rethrow;
-    }
-  }
-}

dialer/lib/services/contact_service.dart

@@ -1,51 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_contacts/flutter_contacts.dart';
-import 'package:qr_flutter/qr_flutter.dart';
-
-// Service to manage contact-related operations
-class ContactService {
-  Future<List<Contact>> fetchContacts() async {
-    if (await FlutterContacts.requestPermission()) {
-      return await FlutterContacts.getContacts(
-          withProperties: true,
-          withThumbnail: true,
-          withAccounts: true,
-          withGroups: true,
-          withPhoto: true);
-    }
-    return [];
-  }
-
-  Future<List<Contact>> fetchFavoriteContacts() async {
-    List<Contact> contacts = await fetchContacts();
-    return contacts.where((contact) => contact.isStarred).toList();
-  }
-
-  Future<void> addNewContact(Contact contact) async {
-    await FlutterContacts.insertContact(contact);
-  }
-
-  // Function to show an AlertDialog with a QR code for the contact's vCard
-  void showContactQRCodeDialog(BuildContext context, Contact contact) {
-    showDialog(
-      barrierColor: Colors.white24,
-      context: context,
-      barrierDismissible: true,
-      builder: (BuildContext context) {
-        return AlertDialog(
-          backgroundColor: Colors.black,
-          content: SizedBox(
-            width: 200,
-            height: 220,
-            child: QrImageView(
-              data: contact.toVCard(), // Generate vCard QR code
-              version: QrVersions.auto,
-              backgroundColor: Colors.white, // Make sure QR code is visible on black background
-              size: 200.0,
-            ),
-          ),
-        );
-      },
-    );
-  }
-}

dialer/lib/widgets/color_darkener.dart

@@ -1,10 +0,0 @@
-import 'package:flutter/material.dart';
-
-Color darken(Color color, [double amount = .1]) {
-  assert(amount >= 0 && amount <= 1);
-
-  final hsl = HSLColor.fromColor(color);
-  final hslDark = hsl.withLightness((hsl.lightness - amount).clamp(0.0, 1.0));
-
-  return hslDark.toColor();
-}

dialer/lib/widgets/username_color_generator.dart

@@ -1,12 +0,0 @@
-import 'dart:math';
-import 'package:flutter/material.dart';
-
-Color generateColorFromName(String name) {
-  final random = Random(name.hashCode);
-  return Color.fromARGB(
-    255,
-    random.nextInt(256),
-    random.nextInt(256),
-    random.nextInt(256),
-  );
-}

dialer/pubspec.yaml

@@ -55,6 +55,7 @@ dependencies:
   encrypt: ^5.0.3  
   uuid: ^4.5.1
   provider: ^6.1.2
+  sim_data_new: ^1.0.1
 
   intl: any
 

dialer/stealth_local_run.sh

@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 
 echo "Running Icing Dialer in STEALTH mode..."
-flutter run --dart-define=STEALTH=true
+flutter run  --release --dart-define=STEALTH=true

docs/Icing.md

@@ -3,7 +3,7 @@
 An Epitech Innovation Project
 
 *By*
-**Bartosz Michalak - Alexis Danlos - Florian Griffon - Ange Duhayon - Stéphane Corbière**
+**Bartosz Michalak - Alexis Danlos - Florian Griffon - Stéphane Corbière**
 
 ---
 
@@ -17,13 +17,25 @@ An Epitech Innovation Project
 
 ## Introduction to Icing
 
-Icing is the name of our project, which is divided in **two interconnected goals**:
-1. Provide an end-to-end (E2E) encryption **code library**, based on Eliptic Curve Cryptography (ECC), to encrypt phone-calls on an **analog audio** level.
-2. Provide a reference implementation in the form of a totally seamless Android **smartphone dialer** application, that anybody could use without being aware of its encryption feature.
+Icing is the name of our project, which is divided in **three interconnected goals**:
+1. Build a mutual-authentication and end-to-end encryption protocol, NAAP, for half and full-duplex audio communication, network agnostic. Network Agnostic Authentication Protocol.
+2. Provide a reference implementation in the form of an **Android Package**, that anybody can use to implement the protocol into their application.
+3. Provide a reference implementation in the form of an **Android Dialer**, that uses the android package, and that could seamlessly replace any Android user's default dialer.
 
-This idea came naturally to our minds, when we remarked the lack of such tool.
 
-Where "private messaging" and other "encrypted communication" apps flourish, nowadays, they **all** require an internet access to work.
+### Setting a new security standard
+
+#### ***"There is no way to create a backdoor that only the good guys can walk through"***
+> (*Meredith Whittaker - President of Signal Fundation - July 2023, Channel 4*)
+
+Enabling strong authentication on the phone network, either cellular or cable, would change the way we use our phone.
+
+Reduced phone-related scams, simplified and safer banking or government services interactions, reduced dependency to the internet, and more, are the benefits both consumers and organizations would enjoy.
+
+Encrypting the data end-to-end increases security globally by a considerable factor, particularly in low-bandwidth / no internet areas, and the added privacy would benefit everyone.
+
+
+---
 
 ### Privacy and security in telecoms should not depend on internet availability.
 
@@ -35,21 +47,6 @@ So in a real-world, stressful and harsh condition, affording privacy or security
 Our solution is for the every-man that is not even aware of its smart phone weakness, as well as for the activists or journalists surviving in hostile environment around the globe.
 
 
-### Setting a new security standard
-
-#### ***"There is no way to create a backdoor that only the good guys can walk through"***
-> (*Meredith Whittaker - President of Signal Fundation - July 2023, Channel 4*)
-
-If the police can listen to your calls with a mandate, hackers can, without mandate.
-
-Many online platforms, such as online bank accounts, uses phone calls, or voicemails to drop security codes needed for authentication. The idea is to bring extra security, by requiring a second factor to authenticate the user, but most voicemails security features have been obsolete for a long time now.
-
-**But this could change with globalized end-to-end encryption.**
-
-This not only enables obfuscation of the transmitted audio data, but also hard peer authentication.
-This means that if you are in an important call, where you could communicate sensitive information such as passwords, or financial orders, using Icing protocol you and your peer would know that there is no man in the middle, listening and stealing information, and that your correspondent really is who it says.
-
----
 
 ### Icing's strategy
 

docs/UserManual.md

@@ -1,71 +1,182 @@
+# User Manual for Icing Dialer
 
-# User Manual
+## Introduction
 
+The Icing Dialer is an open-source mobile application designed to enable end-to-end encrypted voice calls over GSM/LTE networks, ensuring privacy without reliance on the internet, servers, or third-party infrastructure. This manual provides comprehensive guidance for three audiences: average users, security experts, and developers. A final section outlines our manual testing policy to ensure the application's reliability and security.
 
-**Utilization documentation.**
-
-Written with chapters for the average Joe user, security experts, and developers.
-
-The average-user section is only about what the average-user will know from Icing: its dialer reference implementation.
-
-The security expert section will cover all the theory behind our reference implementation, and the Icing protocol. This section can serve as an introduction / transition for the next section:
-
-The developer section will explain our code architecture and concepts, going in-depth inside the reference implementation and the Icing protocol library.
-This library will have dedicated documentation in this section, so any developer can implement it in any desired way.
-
-Lastly, as a continuation of the developer section, the Manual Test section will cover our manual testing policy.
+- **Average User**: Instructions for using the Icing Dialer as a transparent replacement for the default phone dialer.
+- **Security Expert**: Technical details of the Icing protocol, including cryptographic mechanisms and implementation.
+- **Developer**: In-depth explanation of the code architecture, Icing protocol library, and integration guidelines.
+- **Manual Tests**: Overview of the manual testing policy for validating the application and protocol.
 
 ---
 
-
-
 ## Summary
 
-  
-
-- [Average User](#averageuser)
-
-- [Security Expert](#icingsstrategy)
-
+- [Average User](#average-user)
+- [Security Expert](#security-expert)
 - [Developer](#developer)
-
-- [Manual Tests](#manualtests)
-
-  
+- [Manual Tests](#manual-tests)
 
 ---
 
-  
-
 ## Average User
 
+The Icing Dialer is a privacy-focused mobile application that replaces your default phone dialer, providing secure, end-to-end encrypted voice calls over GSM/LTE networks. It is designed to be intuitive and indistinguishable from a standard dialer, ensuring seamless use for all users.
 
-Use the Icing dialer like your normal dialer, if you can't do that we can't help, you dumb retard lmfao.
+### Key Features
+- **Seamless Dialer Replacement**: Functions as a full replacement for your phone’s default dialer, supporting standard call features and encrypted calls.
+- **Cryptographic Key Pair Generation**: Automatically generates an ED25519 key pair during setup for secure communications, stored securely using the Android Keystore.
+- **Secure Contact Sharing**: Adds and shares contacts via QR codes or VCF files, ensuring privacy.
+- **Automatic Call Encryption**: Encrypts calls with compatible Icing Dialer users using the Noise protocol, encoded into the analog audio signal via Codec2 and 4FSK modulation.
+- **On-the-Fly Pairing**: Detects other Icing Dialer users and offers encrypted pairing during calls (optional, under development).
+- **Call Management**: Includes call history, contact management, visual voicemail, and features like mute, speaker, and SIM selection.
+- **Privacy Protection**: Safeguards sensitive communications with secure voice authentication and encrypted voicemail.
 
+### Getting Started
+1. **Installation**: Install the Icing Dialer from a trusted source (e.g., a partnered AOSP fork or Magisk module for rooted Android devices).
+2. **Setup**: Upon first launch, the app generates an ED25519 key pair using the Android Keystore. Follow prompts to complete setup.
+3. **Adding Contacts**: Use the QR code or VCF import feature to securely add contacts. Scan a contact’s QR code or import a VCF file to establish a secure connection.
+4. **Making Calls**: Dial numbers using the full dialer interface (numbers, *, #). The app uses the Android Telephony API to detect compatible users and automatically encrypts calls when possible.
+5. **Encrypted Calls**: Calls to known contacts with public keys are automatically encrypted. A data rate and error indicator provide real-time feedback. Use the disable encryption button if needed.
+6. **Call History and Contacts**: Access call history with filters for missed, incoming, and outgoing calls. Tap a call to view details or open a contact modal. Manage contacts with search, favorites, and blocklist features.
+7. **Visual Voicemail**: Play, pause, or manage voicemails with quick links to call, text, block, or share numbers.
+8. **Settings**: Configure default SIM, manage public keys, and access the blocklist via the settings menu.
 
+### Troubleshooting
+- **FAQs**: Available on our Reddit and Telegram channels for common issues and setup guidance.
+- **Feedback**: Submit feedback via our anonymous CryptPad form for prompt issue resolution.
+
+### Example Scenarios
+- **Secure Voicemail Access**: Mathilda, 34, uses Icing to securely retrieve a PayPal authentication code from her voicemail, protected by her registered Icing public key.
+- **Authenticated Calls**: Jeff, 70, authenticates with his bank using encrypted DTMF transmission, ensuring secure and verified communication.
+- **Private Communication**: Elise, 42, a journalist, uses Icing to make discreet, encrypted calls despite unreliable or monitored networks.
+- **Emergency Calls Abroad**: Paul, 22, a developer, uses Icing to securely assist colleagues with a critical issue while abroad, relying only on voice calls.
 
 ---
 
-  
-
 ## Security Expert
 
-  SecUriTy eXpeRt
+The Icing Dialer is the reference implementation of the Icing protocol, an open, decentralized encryption protocol for telephony. This section details the cryptographic and technical foundations, focusing on security principles.
+
+### Icing Protocol Overview
+The Icing protocol enables end-to-end encrypted voice calls over GSM/LTE networks by encoding cryptographic data into the analog audio signal. Key components include:
+- **End-to-End Encryption**: Utilizes the Noise protocol with XX (mutual authentication) and XK (known-key) handshake patterns for secure session establishment, using ED25519 key pairs.
+- **Perfect Forward Secrecy**: Ensures session keys are ephemeral and discarded after use, with future sessions salted using pseudo-random values derived from past calls.
+- **Codec2 and 4FSK**: Voice data is compressed using Codec2 and modulated with 4FSK (Four Frequency Shift Keying) for transmission over GSM/LTE.
+- **Secure Contact Pairing**: Uses QR codes or VCF files for secure key exchange, preventing man-in-the-middle attacks.
+- **Encrypted DTMF**: Supports secure transmission of DTMF signals for authentication scenarios.
+- **Forward Error Correction (FEC)**: Detects up to 50% of transmission errors in Alpha 1, with plans for stronger FEC (>80% detection, 20% correction) in future iterations.
+- **Decentralized Design**: Operates without servers or third-party intermediaries, minimizing attack surfaces.
+- **Voice Authentication**: Implements cryptographic voice authentication to verify caller identity.
+
+### Security Implementation
+- **Cryptographic Framework**: Uses ED25519 key pairs for authentication and encryption, generated and stored securely via the Android Keystore. The Noise protocol ensures secure key exchange and session setup. AES-256 and ECC (P-256, ECDH) are employed for data encryption.
+- **Analog Signal Encoding**: Codec2 compresses voice data, and 4FSK modulates encrypted data into the analog audio signal, ensuring compatibility with GSM/LTE networks.
+- **Threat Model**: Protects against eavesdropping, interception, replay attacks, and unauthorized access. Includes replay protection mechanisms and assumes adversaries may control network infrastructure but not device endpoints.
+- **Data Privacy**: Minimizes data storage (only encrypted keys and minimal metadata), with no unencrypted call metadata stored. Sensitive data is encrypted at rest.
+- **Current Status**: Protocol Alpha 1, tested in DryBox, validates peer ping, ephemeral key management, handshakes, real-time encryption, stream compression, and 4FSK transmission. Alpha 2 will enhance FEC and on-the-fly key exchange.
+
+### Future Considerations
+- Develop a full RFC for the Icing protocol, documenting peer ping, handshakes, and FEC.
+- Optimize Codec2 and 4FSK for improved audio quality and transmission reliability.
+- Implement embedded silent data transmission (e.g., DTMF) and on-the-fly key exchange.
+- Enhance interoperability with existing standards (e.g., SIP, WebRTC).
 
 ---
 
-  
-
 ## Developer
 
-int main;
+The Icing Dialer and its protocol are open-source and extensible. This section explains the code architecture, Icing protocol library, and guidelines for integration into custom applications.
 
-  ---
+### Code Architecture
+The Icing Dialer is developed in two implementations:
+- **Root-app**: For rooted Android devices, deployed via a Magisk module (~85% complete for Alpha 1).
+- **AOSP-app**: Integrated into a custom AOSP fork for native support, pending partnerships with AOSP-based projects (e.g., GrapheneOS, LineageOS).
+
+The application is written in Kotlin, leveraging the Android Telephony API for call management and a modular architecture:
+- **UI Layer**: A responsive, intuitive interface resembling a default phone dialer, with accessibility features, contact management, and call history.
+- **Encryption Layer**: Manages ED25519 key pair generation (via Android Keystore or RAM for export), Noise protocol handshakes (XX and XK), Codec2 compression, and 4FSK modulation.
+- **Network Layer**: Interfaces with GSM/LTE networks via the Android Telephony API to encode encrypted data into analog audio signals.
+
+### Icing Protocol Library
+The Kotlin-based Icing protocol library (~75% complete for Alpha 1) enables third-party applications to implement the Icing protocol. Key components include:
+- **KeyPairGenerator**: Generates and manages ED25519 key pairs, supporting secure (Android Keystore) and insecure (RAM) generation, with export/import capabilities.
+- **NoiseProtocolHandler**: Implements XX and XK handshakes for secure session establishment, ensuring Perfect Forward Secrecy.
+- **QRCodeHandler**: Manages secure contact sharing via QR codes or VCF files.
+- **AudioEncoder**: Compresses voice with Codec2 and modulates encrypted data with 4FSK.
+- **CallManager**: Uses the Android Telephony API to detect peers, initiate calls, and handle DTMF transmission.
+- **FECModule**: Implements basic FEC for detecting 50% of transmission errors, with plans for enhanced detection and correction.
+
+#### Integration Guide
+1. **Include the Library**: Add the Icing protocol library to your project (available upon Beta release).
+2. **Initialize KeyPairGenerator**: Generate an ED25519 key pair using Android Keystore for secure storage or RAM for exportable keys.
+3. **Implement NoiseProtocolHandler**: Configure XX or XK handshakes for authentication and session setup.
+4. **Integrate QRCodeHandler**: Enable contact sharing via QR codes or VCF files.
+5. **Use AudioEncoder**: Compress voice with Codec2 and modulate with 4FSK for GSM/LTE transmission.
+6. **Leverage CallManager**: Manage calls and DTMF via the Android Telephony API.
+7. **Test with DryBox**: Validate implementation using the Python-based DryBox environment for end-to-end call simulation.
+
+### Development Status
+- **Protocol Alpha 1**: Implemented in DryBox, supporting peer ping, ephemeral keys, handshakes, encryption, Codec2 compression, and 4FSK modulation.
+- **Kotlin Library**: 75% complete, with tasks remaining for Alpha 1 completion.
+- **Root-app**: 85% complete, with Magisk deployment in progress.
+- **AOSP-app**: In development, pending AOSP fork partnerships.
+
+Developers can join our Reddit or Telegram communities for updates and to contribute to the open-source project.
+
+---
 
 ## Manual Tests
 
-1. Call grandpa
-2. Receive mum call
-3. Order 150g of 95% pure Bolivian coke without encryption
-4. Order again but with encryption
-5. Compare results
+The Icing project employs a rigorous manual testing policy to ensure the reliability, security, and usability of the Icing Dialer and its protocol. This section outlines our testing approach, incorporating beta testing scenarios and evaluation criteria.
+
+### Testing Environment
+- **DryBox**: A Python-based environment simulating end-to-end encrypted calls over a controlled network, used to validate Protocol Alpha 1 and future iterations.
+- **Root-app Testing**: Conducted on rooted Android devices using Magisk modules.
+- **AOSP-app Testing**: Planned for custom AOSP forks, pending partnerships.
+
+### Manual Testing Policy
+- **Usability Testing**: Beta testers evaluate the dialer’s intuitiveness as a drop-in replacement, testing call initiation, contact management, and voicemail. Initial tests confirm usability without prior instructions.
+- **Encryption Validation**: Tests in DryBox verify end-to-end encryption using Noise protocol (XX/XK handshakes), ED25519 key pairs, Codec2, and 4FSK. Includes encrypted DTMF and FEC (50% error detection).
+- **Contact Pairing**: Tests QR code and VCF-based contact sharing for security and functionality.
+- **Call Scenarios**: Tests include clear calls (to non-Icing and Icing dialers), encrypted calls (to known and unknown contacts), and DTMF transmission.
+- **Performance Testing**: Ensures minimal latency, low bandwidth usage, and high audio quality (clarity, minimal distortion) via Codec2/4FSK.
+- **Privacy Testing**: Verifies encrypted storage of keys and minimal metadata, with no unencrypted call logs stored.
+- **Integration Testing**: Validates Android Telephony API integration, permissions (microphone, camera, contacts), and background operation.
+
+### Beta Testing Scenarios
+- Clear call from Icing Dialer to another dialer (e.g., Google, Apple).
+- Clear call between two Icing Dialers.
+- Clear call to a known contact (with public key) without Icing Dialer.
+- Encrypted call to a known contact with Icing Dialer.
+- Encrypted call to an unknown contact with Icing Dialer (optional, under development).
+- Create/edit/save contacts with/without public keys.
+- Share/import contacts via QR code/VCF.
+- Listen to voicemail and verify encryption.
+- Record and verify encrypted call integrity.
+- Change default SIM.
+
+### Evaluation Criteria
+- **Security**: Validates AES-256/ECC encryption, ED25519 key management, Perfect Forward Secrecy, replay protection, and end-to-end encryption integrity.
+- **Performance**: Measures call setup latency, bandwidth efficiency, and audio quality (clarity, consistency).
+- **Usability**: Ensures intuitive UI, seamless call handling, and robust error recovery.
+- **Interoperability**: Tests compatibility with GSM/LTE networks and potential future integration with SIP/WebRTC.
+- **Privacy**: Confirms encrypted data storage, minimal permissions, and no unencrypted metadata.
+- **Maintainability**: Reviews code quality, modularity, and documentation for the protocol and library.
+
+### Current Testing Status
+- **Protocol Alpha 1**: Validated in DryBox for encryption, handshakes, Codec2/4FSK, and FEC.
+- **Root-app**: 85% complete, undergoing usability, performance, and security testing.
+- **Feedback Channels**: Anonymous feedback via CryptPad and FAQs on Reddit/Telegram inform testing.
+
+### Future Testing Plans
+- Test Protocol Alpha 2 for enhanced FEC and on-the-fly key exchange.
+- Conduct AOSP-app testing with partnered forks.
+- Incorporate NPS/CSAT metrics from AMAs to assess user satisfaction.
+
+---
+
+## Conclusion
+
+The Icing Dialer and its protocol offer a pioneering approach to secure telephony, leveraging ED25519 key pairs, the Noise protocol, Codec2, 4FSK, and the Android Telephony API. This manual provides comprehensive guidance for users, security experts, and developers, supported by a robust testing policy. For further details or to contribute, visit our Reddit or Telegram communities.

gonogo-review/Beta_Test_Plan.md

@@ -27,14 +27,13 @@ The protocol definition will include as completed:
 - Handshakes
 - Real-time data-stream encryption (and decryption)
 - Encrypted stream compression
-- Transmission over audio stream
-- Minimal error correction in audio-based transmission
-- Error handling and user prevention
+- Transmission over audio stream (at least one modulation type)
+- First steps in FEC (Forward Error Correction): detecting half of transmission errors
 
 And should include prototype or scratches functionalities, among which:
-- Embedded silent data transmission (silently transmit light data during an encrypted phone call)
+- Embedded silent data transmission (such as DTMF)
 - On-the-fly key exchange (does not require prior key exchange, sacrifying some security)
-- Strong error correction
+- Stronger FEC: detecting >80%, correcting 20% of transmission errors
 
 #### The Icing dialer (based on Icing kotlin library, an Icing protocol implementation)
 
@@ -128,16 +127,15 @@ The remote bank advisor asks him to authenticate, making him type his password o
 By using the Icing protocol, not only would Jeff and the bank be assured that the informations are transmitted safely,
 but also that the call is coming from Jeff's phone and not an impersonator.
 
-Elise is a 42 years-old extreme reporter.
-After interviewing Russians opposition's leader, the FSB is looking to interview her.
-She tries to stay discreet and hidden, but those measures constrains her to barely receive cellular network.
-She suspects her phone line to be monitored, so the best she can do to call safely, is to use her Icing dialer.
+Elise, 42 years-old, is a journalist covering sensitive topics.
+Her work draws attention from people who want to know what she's saying - and to whom.
+Forced to stay discreet, with unreliable signal and a likely monitored phone line,
+she uses Icing dialer to make secure calls without exposing herself.
 
-Paul, a 22 years-old developer working for a big company, decides to go to China for vacations.
+Paul, a 22 years-old developer, is enjoying its vacations abroad.
 But everything goes wrong! The company's product he works on, is failling in the middle of the day and no one is
-qualified to fix it. Paul doesn't have WiFi and his phone plan only covers voice calls in China.
-With Icing dialer, he can call his collegues and help fix the
-problem, safe from potential Chinese spies.
+qualified to fix it. Paul doesn't have WiFi and his phone plan only covers voice calls in his country.
+With Icing dialer, he can call his collegues and help fix the problem, completely safe.
 
 ## Evaluation Criteria
 ### Protocol and lib

gonogo-review/Roadmap_PGE-5.md

@@ -0,0 +1,69 @@
+# Context
+
+## Glossary
+
+- DryBox: Our python test environment, simulating a call Initiator and Responder using the protocol through a controlled cellular network.
+- Root-app: A version of the application only installable on rooted Android devices.
+- AOSP-app: A version of the application imbedded in an AOSP fork, coming with an AOSP install.
+- AOSP: Android Open Source Project. The bare-bone of Android maintained by google, currently Open-Source, and forked by many. GrapheneOS, LineageOS, and /e/ are examples of AOSP forks.
+- Magisk module: Magisk is the reference open-source Android rooting tool, a Magisk Module is a script leveraging Magisk's root tools to install or tweak a specific app or setting with special permissions. 
+- Alpha 1, 2, Beta: We plan two iterations of Alpha development, leading towards a final Beta protocol and root/AOSP applications release.
+
+## Current status:
+
+Protocol Alpha 1 => DryBox
+
+App => 85% done
+
+Kotlin Lib => 75% Alpha 1 done
+
+Partnerships => Communication engaged
+
+## Remaining steps:
+
+- Design and test Protocol Alpha 2
+- Finish Alpha 1 Lib's implementation
+- Implement Root-app Alpha 1
+- Streamline Root-app tests
+- Develop at least one AOSP fork partnership
+- AOSP forks' local AOSP-app implementation
+- AOSP forks' partnership AOSP-app implementation
+- Magisk Root-app module self-hosted or official deployment
+
+
+---
+
+# Plan
+
+Our plan is defined with monthly granularity.
+
+Every month, a recap will be published on Telegram and Reddit about the achieved goals, suprises, and feeling on next month's goal.
+
+- ### September & October
+
+  - Finish Alpha 1 lib's and Root-app implementation
+  - App features & UI improvements
+  - Streamlined Root-app tests
+
+- ### November
+
+  - Magisk Root-app module
+  - Drybox features improvements
+  - Alpha 2 theory and Drybox testing
+
+- ### December
+
+  - AOSP forks' local app implementation (AOSP-app)
+  - App features & UI improvements
+  - IF APPLICABLE: AOSP fork real partnership (i.e GrapheneOS, LineageOS, /e/, etc...)
+
+- ### January
+
+  - Root-app & AOSP-app Alpha 2 implementation
+  - Entire code audit and Beta Release preparation
+  - Enhancement from "Alpha 2" to Beta
+
+- ### February
+
+  - Website and community Beta Release preparation
+  - Official Beta Release event: Root-app and AOSP-app APK Alpha APK publication

protocol_prototype/DryBox/UI/audio_player.py

@@ -0,0 +1,253 @@
+import wave
+import threading
+import queue
+import time
+import os
+from datetime import datetime
+from PyQt5.QtCore import QObject, pyqtSignal
+
+# Try to import PyAudio, but handle if it's not available
+try:
+    import pyaudio
+    PYAUDIO_AVAILABLE = True
+except ImportError:
+    PYAUDIO_AVAILABLE = False
+    print("Warning: PyAudio not installed. Audio playback will be disabled.")
+    print("To enable playback, install with: sudo dnf install python3-devel portaudio-devel && pip install pyaudio")
+
+class AudioPlayer(QObject):
+    playback_started = pyqtSignal(int)  # client_id
+    playback_stopped = pyqtSignal(int)  # client_id
+    recording_saved = pyqtSignal(int, str)  # client_id, filepath
+    
+    def __init__(self):
+        super().__init__()
+        self.audio = None
+        self.streams = {}  # client_id -> stream
+        self.buffers = {}  # client_id -> queue
+        self.threads = {}  # client_id -> thread
+        self.recording_buffers = {}  # client_id -> list of audio data
+        self.recording_enabled = {}  # client_id -> bool
+        self.playback_enabled = {}  # client_id -> bool
+        self.sample_rate = 8000
+        self.channels = 1
+        self.chunk_size = 320  # 40ms at 8kHz
+        self.debug_callback = None
+        
+        if PYAUDIO_AVAILABLE:
+            try:
+                self.audio = pyaudio.PyAudio()
+            except Exception as e:
+                self.debug(f"Failed to initialize PyAudio: {e}")
+                self.audio = None
+        else:
+            self.audio = None
+            self.debug("PyAudio not available - playback disabled, recording still works")
+    
+    def debug(self, message):
+        if self.debug_callback:
+            self.debug_callback(f"[AudioPlayer] {message}")
+        else:
+            print(f"[AudioPlayer] {message}")
+    
+    def set_debug_callback(self, callback):
+        self.debug_callback = callback
+    
+    def start_playback(self, client_id):
+        """Start audio playback for a client"""
+        if not self.audio:
+            self.debug("Audio playback not available - PyAudio not installed")
+            self.debug("To enable: sudo dnf install python3-devel portaudio-devel && pip install pyaudio")
+            return False
+            
+        if client_id in self.streams:
+            self.debug(f"Playback already active for client {client_id}")
+            return False
+        
+        try:
+            # Create audio stream
+            stream = self.audio.open(
+                format=pyaudio.paInt16,
+                channels=self.channels,
+                rate=self.sample_rate,
+                output=True,
+                frames_per_buffer=self.chunk_size
+            )
+            
+            self.streams[client_id] = stream
+            self.buffers[client_id] = queue.Queue()
+            self.playback_enabled[client_id] = True
+            
+            # Start playback thread
+            thread = threading.Thread(
+                target=self._playback_thread,
+                args=(client_id,),
+                daemon=True
+            )
+            self.threads[client_id] = thread
+            thread.start()
+            
+            self.debug(f"Started playback for client {client_id}")
+            self.playback_started.emit(client_id)
+            return True
+            
+        except Exception as e:
+            self.debug(f"Failed to start playback for client {client_id}: {e}")
+            return False
+    
+    def stop_playback(self, client_id):
+        """Stop audio playback for a client"""
+        if client_id not in self.streams:
+            return
+        
+        self.playback_enabled[client_id] = False
+        
+        # Wait for thread to finish
+        if client_id in self.threads:
+            self.threads[client_id].join(timeout=1.0)
+            del self.threads[client_id]
+        
+        # Close stream
+        if client_id in self.streams:
+            try:
+                self.streams[client_id].stop_stream()
+                self.streams[client_id].close()
+            except:
+                pass
+            del self.streams[client_id]
+        
+        # Clear buffer
+        if client_id in self.buffers:
+            del self.buffers[client_id]
+        
+        self.debug(f"Stopped playback for client {client_id}")
+        self.playback_stopped.emit(client_id)
+    
+    def add_audio_data(self, client_id, pcm_data):
+        """Add audio data to playback buffer"""
+        # Initialize frame counter for debug logging
+        if not hasattr(self, '_frame_count'):
+            self._frame_count = {}
+        if client_id not in self._frame_count:
+            self._frame_count[client_id] = 0
+        self._frame_count[client_id] += 1
+        
+        # Only log occasionally to avoid spam
+        if self._frame_count[client_id] == 1 or self._frame_count[client_id] % 25 == 0:
+            self.debug(f"Client {client_id} audio frame #{self._frame_count[client_id]}: {len(pcm_data)} bytes")
+        
+        if client_id in self.buffers:
+            self.buffers[client_id].put(pcm_data)
+            if self._frame_count[client_id] == 1:
+                self.debug(f"Client {client_id} buffer started, queue size: {self.buffers[client_id].qsize()}")
+        else:
+            self.debug(f"Client {client_id} has no buffer (playback not started?)")
+        
+        # Add to recording buffer if recording
+        if self.recording_enabled.get(client_id, False):
+            if client_id not in self.recording_buffers:
+                self.recording_buffers[client_id] = []
+            self.recording_buffers[client_id].append(pcm_data)
+    
+    def _playback_thread(self, client_id):
+        """Thread function for audio playback"""
+        stream = self.streams.get(client_id)
+        buffer = self.buffers.get(client_id)
+        
+        if not stream or not buffer:
+            return
+        
+        self.debug(f"Playback thread started for client {client_id}")
+        
+        while self.playback_enabled.get(client_id, False):
+            try:
+                # Get audio data from buffer with timeout
+                audio_data = buffer.get(timeout=0.1)
+                
+                # Only log first frame to avoid spam
+                if not hasattr(self, '_playback_logged'):
+                    self._playback_logged = {}
+                if client_id not in self._playback_logged:
+                    self._playback_logged[client_id] = False
+                    
+                if not self._playback_logged[client_id]:
+                    self.debug(f"Client {client_id} playback thread playing first frame: {len(audio_data)} bytes")
+                    self._playback_logged[client_id] = True
+                
+                # Play audio
+                stream.write(audio_data)
+                
+            except queue.Empty:
+                # No data available, continue
+                continue
+            except Exception as e:
+                self.debug(f"Playback error for client {client_id}: {e}")
+                break
+        
+        self.debug(f"Playback thread ended for client {client_id}")
+    
+    def start_recording(self, client_id):
+        """Start recording received audio"""
+        self.recording_enabled[client_id] = True
+        self.recording_buffers[client_id] = []
+        self.debug(f"Started recording for client {client_id}")
+    
+    def stop_recording(self, client_id, save_path=None):
+        """Stop recording and optionally save to file"""
+        if not self.recording_enabled.get(client_id, False):
+            return None
+        
+        self.recording_enabled[client_id] = False
+        
+        if client_id not in self.recording_buffers:
+            return None
+        
+        audio_data = self.recording_buffers[client_id]
+        
+        if not audio_data:
+            self.debug(f"No audio data recorded for client {client_id}")
+            return None
+        
+        # Generate filename if not provided
+        if not save_path:
+            timestamp = datetime.now().strftime("%Y%m%d_%H%M%S")
+            save_path = f"wav/received_client{client_id}_{timestamp}.wav"
+        
+        # Ensure directory exists
+        save_dir = os.path.dirname(save_path)
+        if save_dir:
+            os.makedirs(save_dir, exist_ok=True)
+        
+        try:
+            # Combine all audio chunks
+            combined_audio = b''.join(audio_data)
+            
+            # Save as WAV file
+            with wave.open(save_path, 'wb') as wav_file:
+                wav_file.setnchannels(self.channels)
+                wav_file.setsampwidth(2)  # 16-bit
+                wav_file.setframerate(self.sample_rate)
+                wav_file.writeframes(combined_audio)
+            
+            self.debug(f"Saved recording for client {client_id} to {save_path}")
+            self.recording_saved.emit(client_id, save_path)
+            
+            # Clear recording buffer
+            del self.recording_buffers[client_id]
+            
+            return save_path
+            
+        except Exception as e:
+            self.debug(f"Failed to save recording for client {client_id}: {e}")
+            return None
+    
+    def cleanup(self):
+        """Clean up audio resources"""
+        # Stop all playback
+        for client_id in list(self.streams.keys()):
+            self.stop_playback(client_id)
+        
+        # Terminate PyAudio
+        if self.audio:
+            self.audio.terminate()
+            self.audio = None

protocol_prototype/DryBox/UI/audio_processor.py

@@ -0,0 +1,220 @@
+import numpy as np
+import wave
+import os
+from datetime import datetime
+from PyQt5.QtCore import QObject, pyqtSignal
+import struct
+
+class AudioProcessor(QObject):
+    processing_complete = pyqtSignal(str)  # filepath
+    
+    def __init__(self):
+        super().__init__()
+        self.debug_callback = None
+        
+    def debug(self, message):
+        if self.debug_callback:
+            self.debug_callback(f"[AudioProcessor] {message}")
+        else:
+            print(f"[AudioProcessor] {message}")
+    
+    def set_debug_callback(self, callback):
+        self.debug_callback = callback
+    
+    def apply_gain(self, audio_data, gain_db):
+        """Apply gain to audio data"""
+        # Convert bytes to numpy array
+        samples = np.frombuffer(audio_data, dtype=np.int16)
+        
+        # Apply gain
+        gain_linear = 10 ** (gain_db / 20.0)
+        samples_float = samples.astype(np.float32) * gain_linear
+        
+        # Clip to prevent overflow
+        samples_float = np.clip(samples_float, -32768, 32767)
+        
+        # Convert back to int16
+        return samples_float.astype(np.int16).tobytes()
+    
+    def apply_noise_gate(self, audio_data, threshold_db=-40):
+        """Apply noise gate to remove low-level noise"""
+        samples = np.frombuffer(audio_data, dtype=np.int16)
+        
+        # Calculate RMS in dB
+        rms = np.sqrt(np.mean(samples.astype(np.float32) ** 2))
+        rms_db = 20 * np.log10(max(rms, 1e-10))
+        
+        # Gate the audio if below threshold
+        if rms_db < threshold_db:
+            return np.zeros_like(samples, dtype=np.int16).tobytes()
+        
+        return audio_data
+    
+    def apply_low_pass_filter(self, audio_data, cutoff_hz=3400, sample_rate=8000):
+        """Apply simple low-pass filter"""
+        samples = np.frombuffer(audio_data, dtype=np.int16).astype(np.float32)
+        
+        # Simple moving average filter
+        # Calculate filter length based on cutoff frequency
+        filter_length = int(sample_rate / cutoff_hz)
+        if filter_length < 3:
+            filter_length = 3
+            
+        # Apply moving average
+        filtered = np.convolve(samples, np.ones(filter_length) / filter_length, mode='same')
+        
+        return filtered.astype(np.int16).tobytes()
+    
+    def apply_high_pass_filter(self, audio_data, cutoff_hz=300, sample_rate=8000):
+        """Apply simple high-pass filter"""
+        samples = np.frombuffer(audio_data, dtype=np.int16).astype(np.float32)
+        
+        # Simple differentiator as high-pass
+        filtered = np.diff(samples, prepend=samples[0])
+        
+        # Scale to maintain amplitude
+        scale = cutoff_hz / (sample_rate / 2)
+        filtered *= scale
+        
+        return filtered.astype(np.int16).tobytes()
+    
+    def normalize_audio(self, audio_data, target_db=-3):
+        """Normalize audio to target dB level"""
+        samples = np.frombuffer(audio_data, dtype=np.int16).astype(np.float32)
+        
+        # Find peak
+        peak = np.max(np.abs(samples))
+        if peak == 0:
+            return audio_data
+        
+        # Calculate current peak in dB
+        current_db = 20 * np.log10(peak / 32768.0)
+        
+        # Calculate gain needed
+        gain_db = target_db - current_db
+        
+        # Apply gain
+        return self.apply_gain(audio_data, gain_db)
+    
+    def remove_silence(self, audio_data, threshold_db=-40, min_silence_ms=100, sample_rate=8000):
+        """Remove silence from audio"""
+        samples = np.frombuffer(audio_data, dtype=np.int16)
+        
+        # Calculate frame size for silence detection
+        frame_size = int(sample_rate * min_silence_ms / 1000)
+        
+        # Detect non-silent regions
+        non_silent_regions = []
+        i = 0
+        
+        while i < len(samples):
+            frame = samples[i:i+frame_size]
+            if len(frame) == 0:
+                break
+                
+            # Calculate RMS of frame
+            rms = np.sqrt(np.mean(frame.astype(np.float32) ** 2))
+            rms_db = 20 * np.log10(max(rms, 1e-10))
+            
+            if rms_db > threshold_db:
+                # Found non-silent region, find its extent
+                start = i
+                while i < len(samples):
+                    frame = samples[i:i+frame_size]
+                    if len(frame) == 0:
+                        break
+                    rms = np.sqrt(np.mean(frame.astype(np.float32) ** 2))
+                    rms_db = 20 * np.log10(max(rms, 1e-10))
+                    if rms_db <= threshold_db:
+                        break
+                    i += frame_size
+                non_silent_regions.append((start, i))
+            else:
+                i += frame_size
+        
+        # Combine non-silent regions
+        if not non_silent_regions:
+            return audio_data  # Return original if all silent
+        
+        combined = []
+        for start, end in non_silent_regions:
+            combined.extend(samples[start:end])
+        
+        return np.array(combined, dtype=np.int16).tobytes()
+    
+    def save_processed_audio(self, audio_data, original_path, processing_type):
+        """Save processed audio with descriptive filename"""
+        # Generate new filename
+        base_name = os.path.splitext(os.path.basename(original_path))[0]
+        timestamp = datetime.now().strftime("%Y%m%d_%H%M%S")
+        new_filename = f"{base_name}_{processing_type}_{timestamp}.wav"
+        
+        # Ensure directory exists
+        save_dir = os.path.dirname(original_path)
+        if not save_dir:
+            save_dir = "wav"
+        os.makedirs(save_dir, exist_ok=True)
+        
+        save_path = os.path.join(save_dir, new_filename)
+        
+        try:
+            with wave.open(save_path, 'wb') as wav_file:
+                wav_file.setnchannels(1)
+                wav_file.setsampwidth(2)
+                wav_file.setframerate(8000)
+                wav_file.writeframes(audio_data)
+            
+            self.debug(f"Saved processed audio to {save_path}")
+            self.processing_complete.emit(save_path)
+            return save_path
+            
+        except Exception as e:
+            self.debug(f"Failed to save processed audio: {e}")
+            return None
+    
+    def concatenate_audio_files(self, file_paths, output_path=None):
+        """Concatenate multiple audio files"""
+        if not file_paths:
+            return None
+        
+        combined_data = b''
+        sample_rate = None
+        
+        for file_path in file_paths:
+            try:
+                with wave.open(file_path, 'rb') as wav_file:
+                    if sample_rate is None:
+                        sample_rate = wav_file.getframerate()
+                    elif wav_file.getframerate() != sample_rate:
+                        self.debug(f"Sample rate mismatch in {file_path}")
+                        continue
+                    
+                    data = wav_file.readframes(wav_file.getnframes())
+                    combined_data += data
+                    
+            except Exception as e:
+                self.debug(f"Failed to read {file_path}: {e}")
+        
+        if not combined_data:
+            return None
+        
+        # Save concatenated audio
+        if not output_path:
+            timestamp = datetime.now().strftime("%Y%m%d_%H%M%S")
+            output_path = f"wav/concatenated_{timestamp}.wav"
+        
+        os.makedirs(os.path.dirname(output_path), exist_ok=True)
+        
+        try:
+            with wave.open(output_path, 'wb') as wav_file:
+                wav_file.setnchannels(1)
+                wav_file.setsampwidth(2)
+                wav_file.setframerate(sample_rate or 8000)
+                wav_file.writeframes(combined_data)
+            
+            self.debug(f"Saved concatenated audio to {output_path}")
+            return output_path
+            
+        except Exception as e:
+            self.debug(f"Failed to save concatenated audio: {e}")
+            return None

protocol_prototype/DryBox/UI/main.py

@@ -0,0 +1,714 @@
+import sys
+from PyQt5.QtWidgets import (
+    QApplication, QMainWindow, QWidget, QVBoxLayout, QHBoxLayout,
+    QPushButton, QLabel, QFrame, QSizePolicy, QStyle, QTextEdit, QSplitter,
+    QMenu, QAction, QInputDialog, QShortcut
+)
+from PyQt5.QtCore import Qt, QSize, QTimer, pyqtSignal
+from PyQt5.QtGui import QFont, QTextCursor, QKeySequence
+import time
+import threading
+from phone_manager import PhoneManager
+from waveform_widget import WaveformWidget
+from phone_state import PhoneState
+
+class PhoneUI(QMainWindow):
+    debug_signal = pyqtSignal(str)
+    
+    def __init__(self):
+        super().__init__()
+        self.setWindowTitle("DryBox - Noise XK + Codec2 + 4FSK")
+        self.setGeometry(100, 100, 1200, 900)
+        
+        # Set minimum size to ensure window is resizable
+        self.setMinimumSize(800, 600)
+        
+        # Auto test state
+        self.auto_test_running = False
+        self.auto_test_timer = None
+        self.test_step = 0
+        self.setStyleSheet("""
+            QMainWindow { background-color: #333333; }
+            QLabel { color: #E0E0E0; font-size: 14px; }
+            QPushButton {
+                background-color: #0078D4; color: white; border: none;
+                padding: 10px 15px; border-radius: 5px; font-size: 14px;
+                min-height: 30px;
+            }
+            QPushButton:hover { background-color: #005A9E; }
+            QPushButton:pressed { background-color: #003C6B; }
+            QPushButton#settingsButton { background-color: #555555; }
+            QPushButton#settingsButton:hover { background-color: #777777; }
+            QFrame#phoneDisplay {
+                background-color: #1E1E1E; border: 2px solid #0078D4;
+                border-radius: 10px;
+            }
+            QLabel#phoneTitleLabel {
+                font-size: 18px; font-weight: bold; padding-bottom: 5px;
+                color: #FFFFFF;
+            }
+            QLabel#mainTitleLabel {
+                font-size: 24px; font-weight: bold; color: #00A2E8;
+                padding: 15px;
+            }
+            QWidget#phoneWidget {
+                border: 2px solid #4A4A4A; border-radius: 10px;
+                background-color: #3A3A3A;
+                min-width: 250px;
+            }
+            QTextEdit#debugConsole {
+                background-color: #1E1E1E; color: #00FF00; 
+                font-family: monospace; font-size: 12px;
+                border: 2px solid #0078D4; border-radius: 5px;
+            }
+            QPushButton#autoTestButton {
+                background-color: #FF8C00; min-height: 35px;
+            }
+            QPushButton#autoTestButton:hover { background-color: #FF7F00; }
+        """)
+
+        # Setup debug signal early
+        self.debug_signal.connect(self.append_debug)
+        
+        self.manager = PhoneManager()
+        self.manager.ui = self  # Set UI reference for debug logging
+        self.manager.initialize_phones()
+
+        # Main widget with splitter
+        main_widget = QWidget()
+        self.setCentralWidget(main_widget)
+        main_layout = QVBoxLayout()
+        main_widget.setLayout(main_layout)
+        
+        # Create splitter for phones and debug console
+        self.splitter = QSplitter(Qt.Vertical)
+        main_layout.addWidget(self.splitter)
+        
+        # Top widget for phones
+        phones_widget = QWidget()
+        phones_layout = QVBoxLayout()
+        phones_layout.setSpacing(20)
+        phones_layout.setContentsMargins(20, 20, 20, 20)
+        phones_layout.setAlignment(Qt.AlignCenter)
+        phones_widget.setLayout(phones_layout)
+
+        # App Title
+        app_title_label = QLabel("Integrated Protocol Control Panel")
+        app_title_label.setObjectName("mainTitleLabel")
+        app_title_label.setAlignment(Qt.AlignCenter)
+        phones_layout.addWidget(app_title_label)
+        
+        # Protocol info
+        protocol_info = QLabel("Noise XK + Codec2 (1200bps) + 4FSK")
+        protocol_info.setAlignment(Qt.AlignCenter)
+        protocol_info.setStyleSheet("font-size: 12px; color: #00A2E8;")
+        phones_layout.addWidget(protocol_info)
+
+        # Phone displays layout
+        phone_controls_layout = QHBoxLayout()
+        phone_controls_layout.setSpacing(20)
+        phone_controls_layout.setContentsMargins(10, 0, 10, 0)
+        phones_layout.addLayout(phone_controls_layout)
+
+        # Setup UI for phones
+        for phone in self.manager.phones:
+            phone_container_widget, phone_display_frame, phone_button, waveform_widget, sent_waveform_widget, phone_status_label, playback_button, record_button = self._create_phone_ui(
+                f"Phone {phone['id']+1}", lambda checked, pid=phone['id']: self.manager.phone_action(pid, self)
+            )
+            phone['button'] = phone_button
+            phone['waveform'] = waveform_widget
+            phone['sent_waveform'] = sent_waveform_widget
+            phone['status_label'] = phone_status_label
+            phone['playback_button'] = playback_button
+            phone['record_button'] = record_button
+            
+            # Connect audio control buttons with proper closure
+            playback_button.clicked.connect(lambda checked, pid=phone['id']: self.toggle_playback(pid))
+            record_button.clicked.connect(lambda checked, pid=phone['id']: self.toggle_recording(pid))
+            phone_controls_layout.addWidget(phone_container_widget)
+            # Connect data_received signal - it emits (data, client_id)
+            phone['client'].data_received.connect(lambda data, cid: self.manager.update_waveform(cid, data))
+            phone['client'].state_changed.connect(lambda state, num, cid=phone['id']: self.set_phone_state(cid, state, num))
+            phone['client'].start()
+
+        # Control buttons layout
+        control_layout = QHBoxLayout()
+        control_layout.setSpacing(15)
+        control_layout.setContentsMargins(20, 10, 20, 10)
+        
+        # Auto Test Button
+        self.auto_test_button = QPushButton("🧪 Run Automatic Test")
+        self.auto_test_button.setObjectName("autoTestButton")
+        self.auto_test_button.setMinimumWidth(180)
+        self.auto_test_button.setMaximumWidth(250)
+        self.auto_test_button.clicked.connect(self.toggle_auto_test)
+        control_layout.addWidget(self.auto_test_button)
+        
+        # Clear Debug Button
+        self.clear_debug_button = QPushButton("Clear Debug")
+        self.clear_debug_button.setMinimumWidth(100)
+        self.clear_debug_button.setMaximumWidth(150)
+        self.clear_debug_button.clicked.connect(self.clear_debug)
+        control_layout.addWidget(self.clear_debug_button)
+        
+        # Audio Processing Button
+        self.audio_menu_button = QPushButton("Audio Options")
+        self.audio_menu_button.setMinimumWidth(100)
+        self.audio_menu_button.setMaximumWidth(150)
+        self.audio_menu_button.clicked.connect(self.show_audio_menu)
+        control_layout.addWidget(self.audio_menu_button)
+        
+        # Settings Button
+        self.settings_button = QPushButton("Settings")
+        self.settings_button.setObjectName("settingsButton")
+        self.settings_button.setMinimumWidth(100)
+        self.settings_button.setMaximumWidth(150)
+        self.settings_button.setIcon(self.style().standardIcon(QStyle.SP_FileDialogDetailedView))
+        self.settings_button.setIconSize(QSize(20, 20))
+        self.settings_button.clicked.connect(self.settings_action)
+        control_layout.addWidget(self.settings_button)
+        
+        phones_layout.addLayout(control_layout)
+        
+        # Add phones widget to splitter
+        self.splitter.addWidget(phones_widget)
+        
+        # Debug console
+        self.debug_console = QTextEdit()
+        self.debug_console.setObjectName("debugConsole")
+        self.debug_console.setReadOnly(True)
+        self.debug_console.setMinimumHeight(200)
+        self.debug_console.setMaximumHeight(400)
+        self.splitter.addWidget(self.debug_console)
+        
+        # Flush any queued debug messages
+        if hasattr(self, '_debug_queue'):
+            for msg in self._debug_queue:
+                self.debug_console.append(msg)
+            del self._debug_queue
+        
+        # Set splitter sizes (70% phones, 30% debug)
+        self.splitter.setSizes([600, 300])
+
+        # Initialize UI
+        for phone in self.manager.phones:
+            self.update_phone_ui(phone['id'])
+            
+        # Initial debug message
+        QTimer.singleShot(100, lambda: self.debug("DryBox UI initialized with integrated protocol"))
+        
+        # Setup keyboard shortcuts
+        self.setup_shortcuts()
+
+    def _create_phone_ui(self, title, action_slot):
+        phone_container_widget = QWidget()
+        phone_container_widget.setObjectName("phoneWidget")
+        phone_container_widget.setSizePolicy(QSizePolicy.Preferred, QSizePolicy.Preferred)
+        phone_layout = QVBoxLayout()
+        phone_layout.setAlignment(Qt.AlignCenter)
+        phone_layout.setSpacing(10)
+        phone_layout.setContentsMargins(15, 15, 15, 15)
+        phone_container_widget.setLayout(phone_layout)
+
+        phone_title_label = QLabel(title)
+        phone_title_label.setObjectName("phoneTitleLabel")
+        phone_title_label.setAlignment(Qt.AlignCenter)
+        phone_layout.addWidget(phone_title_label)
+
+        phone_display_frame = QFrame()
+        phone_display_frame.setObjectName("phoneDisplay")
+        phone_display_frame.setMinimumSize(200, 250)
+        phone_display_frame.setMaximumSize(300, 400)
+        phone_display_frame.setSizePolicy(QSizePolicy.Preferred, QSizePolicy.Preferred)
+
+        display_content_layout = QVBoxLayout(phone_display_frame)
+        display_content_layout.setAlignment(Qt.AlignCenter)
+        phone_status_label = QLabel("Idle")
+        phone_status_label.setAlignment(Qt.AlignCenter)
+        phone_status_label.setFont(QFont("Arial", 16))
+        display_content_layout.addWidget(phone_status_label)
+        phone_layout.addWidget(phone_display_frame, alignment=Qt.AlignCenter)
+
+        phone_button = QPushButton()
+        phone_button.setMinimumWidth(100)
+        phone_button.setMaximumWidth(150)
+        phone_button.setIconSize(QSize(20, 20))
+        phone_button.clicked.connect(action_slot)
+        phone_layout.addWidget(phone_button, alignment=Qt.AlignCenter)
+
+        # Received waveform
+        waveform_label = QLabel(f"{title} Received")
+        waveform_label.setAlignment(Qt.AlignCenter)
+        waveform_label.setStyleSheet("font-size: 12px; color: #E0E0E0;")
+        phone_layout.addWidget(waveform_label)
+        waveform_widget = WaveformWidget(dynamic=False)
+        waveform_widget.setMinimumSize(200, 50)
+        waveform_widget.setMaximumSize(300, 80)
+        waveform_widget.setSizePolicy(QSizePolicy.Preferred, QSizePolicy.Fixed)
+        phone_layout.addWidget(waveform_widget, alignment=Qt.AlignCenter)
+
+        # Sent waveform
+        sent_waveform_label = QLabel(f"{title} Sent")
+        sent_waveform_label.setAlignment(Qt.AlignCenter)
+        sent_waveform_label.setStyleSheet("font-size: 12px; color: #E0E0E0;")
+        phone_layout.addWidget(sent_waveform_label)
+        sent_waveform_widget = WaveformWidget(dynamic=False)
+        sent_waveform_widget.setMinimumSize(200, 50)
+        sent_waveform_widget.setMaximumSize(300, 80)
+        sent_waveform_widget.setSizePolicy(QSizePolicy.Preferred, QSizePolicy.Fixed)
+        phone_layout.addWidget(sent_waveform_widget, alignment=Qt.AlignCenter)
+        
+        # Audio control buttons
+        audio_controls_layout = QHBoxLayout()
+        audio_controls_layout.setAlignment(Qt.AlignCenter)
+        
+        playback_button = QPushButton("🔊 Playback")
+        playback_button.setCheckable(True)
+        playback_button.setMinimumWidth(90)
+        playback_button.setMaximumWidth(120)
+        playback_button.setStyleSheet("""
+            QPushButton {
+                background-color: #404040;
+                color: white;
+                border: 1px solid #606060;
+                padding: 5px;
+                border-radius: 3px;
+            }
+            QPushButton:checked {
+                background-color: #4CAF50;
+            }
+            QPushButton:hover {
+                background-color: #505050;
+            }
+        """)
+        
+        record_button = QPushButton("⏺ Record")
+        record_button.setCheckable(True)
+        record_button.setMinimumWidth(90)
+        record_button.setMaximumWidth(120)
+        record_button.setStyleSheet("""
+            QPushButton {
+                background-color: #404040;
+                color: white;
+                border: 1px solid #606060;
+                padding: 5px;
+                border-radius: 3px;
+            }
+            QPushButton:checked {
+                background-color: #F44336;
+            }
+            QPushButton:hover {
+                background-color: #505050;
+            }
+        """)
+        
+        audio_controls_layout.addWidget(playback_button)
+        audio_controls_layout.addWidget(record_button)
+        phone_layout.addLayout(audio_controls_layout)
+
+        return phone_container_widget, phone_display_frame, phone_button, waveform_widget, sent_waveform_widget, phone_status_label, playback_button, record_button
+
+    def update_phone_ui(self, phone_id):
+        phone = self.manager.phones[phone_id]
+        other_phone = self.manager.phones[1 - phone_id]
+        state = phone['state']
+        phone_number = other_phone['number'] if state != PhoneState.IDLE else ""
+        button = phone['button']
+        status_label = phone['status_label']
+
+        if state == PhoneState.IDLE:
+            button.setText("Call")
+            button.setIcon(self.style().standardIcon(QStyle.SP_MediaPlay))
+            status_label.setText("Idle")
+            button.setStyleSheet("background-color: #0078D4;")
+        elif state == PhoneState.CALLING:
+            button.setText("Cancel")
+            button.setIcon(self.style().standardIcon(QStyle.SP_MediaStop))
+            status_label.setText(f"Calling {phone_number}...")
+            button.setStyleSheet("background-color: #E81123;")
+        elif state == PhoneState.IN_CALL:
+            button.setText("Hang Up")
+            button.setIcon(self.style().standardIcon(QStyle.SP_DialogCancelButton))
+            status_label.setText(f"In Call with {phone_number}")
+            button.setStyleSheet("background-color: #E81123;")
+        elif state == PhoneState.RINGING:
+            button.setText("Answer")
+            button.setIcon(self.style().standardIcon(QStyle.SP_DialogApplyButton))
+            status_label.setText(f"Incoming Call from {phone_number}")
+            button.setStyleSheet("background-color: #107C10;")
+
+    def set_phone_state(self, client_id, state_str, number):
+        self.debug(f"Phone {client_id + 1} state change: {state_str}")
+        
+        # Handle protocol-specific states
+        if state_str == "HANDSHAKE_COMPLETE":
+            phone = self.manager.phones[client_id]
+            phone['status_label'].setText("🔒 Secure Channel Established")
+            self.debug(f"Phone {client_id + 1} secure channel established")
+            self.manager.start_audio(client_id, parent=self)
+            return
+        elif state_str == "VOICE_START":
+            phone = self.manager.phones[client_id]
+            phone['status_label'].setText("🎤 Voice Active (Encrypted)")
+            self.debug(f"Phone {client_id + 1} voice session started")
+            return
+        elif state_str == "VOICE_END":
+            phone = self.manager.phones[client_id]
+            phone['status_label'].setText("🔒 Secure Channel")
+            self.debug(f"Phone {client_id + 1} voice session ended")
+            return
+            
+        # Handle regular states
+        state = self.manager.map_state(state_str)
+        phone = self.manager.phones[client_id]
+        other_phone = self.manager.phones[1 - client_id]
+        self.debug(f"Setting state for Phone {client_id + 1}: {state.name if hasattr(state, 'name') else state}, number: {number}, is_initiator: {phone['is_initiator']}")
+        phone['state'] = state
+        if state == PhoneState.IN_CALL:
+            self.debug(f"Phone {client_id + 1} confirmed in IN_CALL state")
+            self.debug(f"  state_str={state_str}, number={number}")
+            self.debug(f"  is_initiator={phone['is_initiator']}")
+            
+            # Only start handshake when the initiator RECEIVES the IN_CALL message
+            if state_str == "IN_CALL" and phone['is_initiator']:
+                self.debug(f"Phone {client_id + 1} (initiator) received IN_CALL, starting handshake")
+                phone['client'].start_handshake(initiator=True, keypair=phone['keypair'], peer_pubkey=other_phone['public_key'])
+            elif number == "HANDSHAKE":
+                # Old text-based handshake trigger - no longer used
+                self.debug(f"Phone {client_id + 1} received legacy HANDSHAKE message")
+            elif number == "HANDSHAKE_DONE":
+                self.debug(f"Phone {client_id + 1} received HANDSHAKE_DONE")
+                # Handled by HANDSHAKE_COMPLETE now
+                pass
+        self.update_phone_ui(client_id)
+
+    def settings_action(self):
+        print("Settings clicked")
+        self.debug("Settings clicked")
+
+    def debug(self, message):
+        """Thread-safe debug logging to both console and UI"""
+        timestamp = time.strftime("%H:%M:%S.%f")[:-3]
+        debug_msg = f"[{timestamp}] {message}"
+        print(debug_msg)  # Console output
+        self.debug_signal.emit(debug_msg)  # UI output
+    
+    def append_debug(self, message):
+        """Append debug message to console (called from main thread)"""
+        if hasattr(self, 'debug_console'):
+            self.debug_console.append(message)
+            # Auto-scroll to bottom
+            cursor = self.debug_console.textCursor()
+            cursor.movePosition(QTextCursor.End)
+            self.debug_console.setTextCursor(cursor)
+        else:
+            # Queue messages until console is ready
+            if not hasattr(self, '_debug_queue'):
+                self._debug_queue = []
+            self._debug_queue.append(message)
+    
+    def clear_debug(self):
+        """Clear debug console"""
+        self.debug_console.clear()
+        self.debug("Debug console cleared")
+    
+    def toggle_auto_test(self):
+        """Toggle automatic test sequence"""
+        if not self.auto_test_running:
+            self.start_auto_test()
+        else:
+            self.stop_auto_test()
+    
+    def start_auto_test(self):
+        """Start automatic test sequence"""
+        self.auto_test_running = True
+        self.auto_test_button.setText("⏹ Stop Test")
+        self.test_step = 0
+        
+        self.debug("=== STARTING AUTOMATIC TEST SEQUENCE ===")
+        self.debug("Test will go through complete protocol flow")
+        
+        # Start test timer
+        self.auto_test_timer = QTimer()
+        self.auto_test_timer.timeout.connect(self.execute_test_step)
+        self.auto_test_timer.start(2000)  # 2 second intervals
+        
+        # Execute first step immediately
+        self.execute_test_step()
+    
+    def stop_auto_test(self):
+        """Stop automatic test sequence"""
+        self.auto_test_running = False
+        self.auto_test_button.setText("🧪 Run Automatic Test")
+        
+        if self.auto_test_timer:
+            self.auto_test_timer.stop()
+            self.auto_test_timer = None
+        
+        self.debug("=== TEST SEQUENCE STOPPED ===")
+    
+    def execute_test_step(self):
+        """Execute next step in test sequence"""
+        phone1 = self.manager.phones[0]
+        phone2 = self.manager.phones[1]
+        
+        self.debug(f"\n--- Test Step {self.test_step + 1} ---")
+        
+        if self.test_step == 0:
+            # Step 1: Check initial state
+            self.debug("Checking initial state...")
+            state1 = phone1['state']
+            state2 = phone2['state']
+            # Handle both enum and int states
+            state1_name = state1.name if hasattr(state1, 'name') else str(state1)
+            state2_name = state2.name if hasattr(state2, 'name') else str(state2)
+            self.debug(f"Phone 1 state: {state1_name}")
+            self.debug(f"Phone 2 state: {state2_name}")
+            self.debug(f"Phone 1 connected: {phone1['client'].sock is not None}")
+            self.debug(f"Phone 2 connected: {phone2['client'].sock is not None}")
+            
+        elif self.test_step == 1:
+            # Step 2: Make call
+            self.debug("Phone 1 calling Phone 2...")
+            self.manager.phone_action(0, self)
+            state1_name = phone1['state'].name if hasattr(phone1['state'], 'name') else str(phone1['state'])
+            state2_name = phone2['state'].name if hasattr(phone2['state'], 'name') else str(phone2['state'])
+            self.debug(f"Phone 1 state after call: {state1_name}")
+            self.debug(f"Phone 2 state after call: {state2_name}")
+            
+        elif self.test_step == 2:
+            # Step 3: Answer call
+            self.debug("Phone 2 answering call...")
+            self.manager.phone_action(1, self)
+            state1_name = phone1['state'].name if hasattr(phone1['state'], 'name') else str(phone1['state'])
+            state2_name = phone2['state'].name if hasattr(phone2['state'], 'name') else str(phone2['state'])
+            self.debug(f"Phone 1 state after answer: {state1_name}")
+            self.debug(f"Phone 2 state after answer: {state2_name}")
+            self.debug(f"Phone 1 is_initiator: {phone1['is_initiator']}")
+            self.debug(f"Phone 2 is_initiator: {phone2['is_initiator']}")
+            
+        elif self.test_step == 3:
+            # Step 4: Check handshake progress
+            self.debug("Checking handshake progress...")
+            self.debug(f"Phone 1 handshake in progress: {phone1['client'].state.handshake_in_progress}")
+            self.debug(f"Phone 2 handshake in progress: {phone2['client'].state.handshake_in_progress}")
+            self.debug(f"Phone 1 command queue: {phone1['client'].state.command_queue.qsize()}")
+            self.debug(f"Phone 2 command queue: {phone2['client'].state.command_queue.qsize()}")
+            # Increase timer interval for handshake
+            self.auto_test_timer.setInterval(3000)  # 3 seconds
+            
+        elif self.test_step == 4:
+            # Step 5: Check handshake status
+            self.debug("Checking Noise XK handshake status...")
+            self.debug(f"Phone 1 handshake complete: {phone1['client'].handshake_complete}")
+            self.debug(f"Phone 2 handshake complete: {phone2['client'].handshake_complete}")
+            self.debug(f"Phone 1 has session: {phone1['client'].noise_session is not None}")
+            self.debug(f"Phone 2 has session: {phone2['client'].noise_session is not None}")
+            # Reset timer interval
+            self.auto_test_timer.setInterval(2000)
+            
+        elif self.test_step == 5:
+            # Step 6: Check voice status
+            self.debug("Checking voice session status...")
+            self.debug(f"Phone 1 voice active: {phone1['client'].voice_active}")
+            self.debug(f"Phone 2 voice active: {phone2['client'].voice_active}")
+            self.debug(f"Phone 1 codec initialized: {phone1['client'].codec is not None}")
+            self.debug(f"Phone 2 codec initialized: {phone2['client'].codec is not None}")
+            self.debug(f"Phone 1 modem initialized: {phone1['client'].modem is not None}")
+            self.debug(f"Phone 2 modem initialized: {phone2['client'].modem is not None}")
+            
+        elif self.test_step == 6:
+            # Step 7: Check audio transmission
+            self.debug("Checking audio transmission...")
+            self.debug(f"Phone 1 audio file loaded: {phone1['audio_file'] is not None}")
+            self.debug(f"Phone 2 audio file loaded: {phone2['audio_file'] is not None}")
+            self.debug(f"Phone 1 frame counter: {phone1.get('frame_counter', 0)}")
+            self.debug(f"Phone 2 frame counter: {phone2.get('frame_counter', 0)}")
+            self.debug(f"Phone 1 audio timer active: {phone1['audio_timer'] is not None and phone1['audio_timer'].isActive()}")
+            self.debug(f"Phone 2 audio timer active: {phone2['audio_timer'] is not None and phone2['audio_timer'].isActive()}")
+            
+        elif self.test_step == 7:
+            # Step 8: Protocol details
+            self.debug("Protocol stack details:")
+            if phone1['client'].codec:
+                self.debug(f"Codec mode: {phone1['client'].codec.mode.name}")
+                self.debug(f"Frame size: {phone1['client'].codec.frame_bits} bits")
+                self.debug(f"Frame duration: {phone1['client'].codec.frame_ms} ms")
+            if phone1['client'].modem:
+                self.debug(f"FSK frequencies: {phone1['client'].modem.frequencies}")
+                self.debug(f"Symbol rate: {phone1['client'].modem.baud_rate} baud")
+            
+        elif self.test_step == 8:
+            # Step 9: Wait for more frames
+            self.debug("Letting voice transmission run...")
+            self.auto_test_timer.setInterval(5000)  # Wait 5 seconds
+            
+        elif self.test_step == 9:
+            # Step 10: Final statistics
+            self.debug("Final transmission statistics:")
+            self.debug(f"Phone 1 frames sent: {phone1.get('frame_counter', 0)}")
+            self.debug(f"Phone 2 frames sent: {phone2.get('frame_counter', 0)}")
+            self.auto_test_timer.setInterval(2000)  # Back to 2 seconds
+            
+        elif self.test_step == 10:
+            # Step 11: Hang up
+            self.debug("Hanging up call...")
+            self.manager.phone_action(0, self)
+            state1_name = phone1['state'].name if hasattr(phone1['state'], 'name') else str(phone1['state'])
+            state2_name = phone2['state'].name if hasattr(phone2['state'], 'name') else str(phone2['state'])
+            self.debug(f"Phone 1 state after hangup: {state1_name}")
+            self.debug(f"Phone 2 state after hangup: {state2_name}")
+            
+        elif self.test_step == 11:
+            # Complete
+            self.debug("\n=== TEST SEQUENCE COMPLETE ===")
+            self.debug("All protocol components tested successfully!")
+            self.stop_auto_test()
+            return
+        
+        self.test_step += 1
+    
+    def toggle_playback(self, phone_id):
+        """Toggle audio playback for a phone"""
+        is_enabled = self.manager.toggle_playback(phone_id)
+        phone = self.manager.phones[phone_id]
+        phone['playback_button'].setChecked(is_enabled)
+        
+        if is_enabled:
+            self.debug(f"Phone {phone_id + 1}: Audio playback enabled")
+        else:
+            self.debug(f"Phone {phone_id + 1}: Audio playback disabled")
+    
+    def toggle_recording(self, phone_id):
+        """Toggle audio recording for a phone"""
+        is_recording, save_path = self.manager.toggle_recording(phone_id)
+        phone = self.manager.phones[phone_id]
+        phone['record_button'].setChecked(is_recording)
+        
+        if is_recording:
+            self.debug(f"Phone {phone_id + 1}: Recording started")
+        else:
+            if save_path:
+                self.debug(f"Phone {phone_id + 1}: Recording saved to {save_path}")
+            else:
+                self.debug(f"Phone {phone_id + 1}: Recording stopped (no data)")
+    
+    def show_audio_menu(self):
+        """Show audio processing options menu"""
+        menu = QMenu(self)
+        
+        # Create phone selection submenu
+        for phone_id in range(2):
+            phone_menu = menu.addMenu(f"Phone {phone_id + 1}")
+            
+            # Export buffer
+            export_action = QAction("Export Audio Buffer", self)
+            export_action.triggered.connect(lambda checked, pid=phone_id: self.export_audio_buffer(pid))
+            phone_menu.addAction(export_action)
+            
+            # Clear buffer
+            clear_action = QAction("Clear Audio Buffer", self)
+            clear_action.triggered.connect(lambda checked, pid=phone_id: self.clear_audio_buffer(pid))
+            phone_menu.addAction(clear_action)
+            
+            phone_menu.addSeparator()
+            
+            # Processing options
+            normalize_action = QAction("Normalize Audio", self)
+            normalize_action.triggered.connect(lambda checked, pid=phone_id: self.process_audio(pid, "normalize"))
+            phone_menu.addAction(normalize_action)
+            
+            gain_action = QAction("Apply Gain...", self)
+            gain_action.triggered.connect(lambda checked, pid=phone_id: self.apply_gain_dialog(pid))
+            phone_menu.addAction(gain_action)
+            
+            noise_gate_action = QAction("Apply Noise Gate", self)
+            noise_gate_action.triggered.connect(lambda checked, pid=phone_id: self.process_audio(pid, "noise_gate"))
+            phone_menu.addAction(noise_gate_action)
+            
+            low_pass_action = QAction("Apply Low Pass Filter", self)
+            low_pass_action.triggered.connect(lambda checked, pid=phone_id: self.process_audio(pid, "low_pass"))
+            phone_menu.addAction(low_pass_action)
+            
+            high_pass_action = QAction("Apply High Pass Filter", self)
+            high_pass_action.triggered.connect(lambda checked, pid=phone_id: self.process_audio(pid, "high_pass"))
+            phone_menu.addAction(high_pass_action)
+            
+            remove_silence_action = QAction("Remove Silence", self)
+            remove_silence_action.triggered.connect(lambda checked, pid=phone_id: self.process_audio(pid, "remove_silence"))
+            phone_menu.addAction(remove_silence_action)
+        
+        # Show menu at button position
+        menu.exec_(self.audio_menu_button.mapToGlobal(self.audio_menu_button.rect().bottomLeft()))
+    
+    def export_audio_buffer(self, phone_id):
+        """Export audio buffer for a phone"""
+        save_path = self.manager.export_buffered_audio(phone_id)
+        if save_path:
+            self.debug(f"Phone {phone_id + 1}: Audio buffer exported to {save_path}")
+        else:
+            self.debug(f"Phone {phone_id + 1}: No audio data to export")
+    
+    def clear_audio_buffer(self, phone_id):
+        """Clear audio buffer for a phone"""
+        self.manager.clear_audio_buffer(phone_id)
+    
+    def process_audio(self, phone_id, processing_type):
+        """Process audio with specified type"""
+        save_path = self.manager.process_audio(phone_id, processing_type)
+        if save_path:
+            self.debug(f"Phone {phone_id + 1}: Processed audio saved to {save_path}")
+        else:
+            self.debug(f"Phone {phone_id + 1}: Audio processing failed")
+    
+    def apply_gain_dialog(self, phone_id):
+        """Show dialog to get gain value"""
+        gain, ok = QInputDialog.getDouble(
+            self, "Apply Gain", "Enter gain in dB:", 
+            0.0, -20.0, 20.0, 1
+        )
+        if ok:
+            save_path = self.manager.process_audio(phone_id, "gain", gain_db=gain)
+            if save_path:
+                self.debug(f"Phone {phone_id + 1}: Applied {gain}dB gain, saved to {save_path}")
+    
+    def setup_shortcuts(self):
+        """Setup keyboard shortcuts"""
+        # Phone 1 shortcuts
+        QShortcut(QKeySequence("1"), self, lambda: self.manager.phone_action(0, self))
+        QShortcut(QKeySequence("Ctrl+1"), self, lambda: self.toggle_playback(0))
+        QShortcut(QKeySequence("Alt+1"), self, lambda: self.toggle_recording(0))
+        
+        # Phone 2 shortcuts
+        QShortcut(QKeySequence("2"), self, lambda: self.manager.phone_action(1, self))
+        QShortcut(QKeySequence("Ctrl+2"), self, lambda: self.toggle_playback(1))
+        QShortcut(QKeySequence("Alt+2"), self, lambda: self.toggle_recording(1))
+        
+        # General shortcuts
+        QShortcut(QKeySequence("Space"), self, self.toggle_auto_test)
+        QShortcut(QKeySequence("Ctrl+L"), self, self.clear_debug)
+        QShortcut(QKeySequence("Ctrl+A"), self, self.show_audio_menu)
+        
+        self.debug("Keyboard shortcuts enabled:")
+        self.debug("  1/2: Phone action (call/answer/hangup)")
+        self.debug("  Ctrl+1/2: Toggle playback")
+        self.debug("  Alt+1/2: Toggle recording")
+        self.debug("  Space: Toggle auto test")
+        self.debug("  Ctrl+L: Clear debug")
+        self.debug("  Ctrl+A: Audio options menu")
+
+    def closeEvent(self, event):
+        if self.auto_test_running:
+            self.stop_auto_test()
+        # Clean up audio player
+        if hasattr(self.manager, 'audio_player'):
+            self.manager.audio_player.cleanup()
+        for phone in self.manager.phones:
+            phone['client'].stop()
+        event.accept()
+
+if __name__ == "__main__":
+    app = QApplication(sys.argv)
+    window = PhoneUI()
+    window.show()
+    sys.exit(app.exec_())

protocol_prototype/DryBox/UI/noise_wrapper.py

@@ -0,0 +1,127 @@
+"""Wrapper for Noise XK handshake over GSM simulator"""
+
+import struct
+from dissononce.processing.impl.handshakestate import HandshakeState
+from dissononce.processing.impl.symmetricstate import SymmetricState
+from dissononce.processing.impl.cipherstate import CipherState
+from dissononce.processing.handshakepatterns.interactive.XK import XKHandshakePattern
+from dissononce.cipher.chachapoly import ChaChaPolyCipher
+from dissononce.dh.x25519.x25519 import X25519DH
+from dissononce.dh.keypair import KeyPair
+from dissononce.dh.x25519.public import PublicKey
+from dissononce.hash.sha256 import SHA256Hash
+
+class NoiseXKWrapper:
+    """Wrapper for Noise XK that works over message-passing instead of direct sockets"""
+    
+    def __init__(self, keypair, peer_pubkey, debug_callback=None):
+        self.keypair = keypair
+        self.peer_pubkey = peer_pubkey
+        self.debug = debug_callback or print
+        
+        # Build handshake state
+        cipher = ChaChaPolyCipher()
+        dh = X25519DH()
+        hshash = SHA256Hash()
+        symmetric = SymmetricState(CipherState(cipher), hshash)
+        self._hs = HandshakeState(symmetric, dh)
+        
+        self._send_cs = None
+        self._recv_cs = None
+        self.handshake_complete = False
+        self.is_initiator = None  # Track initiator status
+        
+        # Message buffers
+        self.outgoing_messages = []
+        self.incoming_messages = []
+        
+    def start_handshake(self, initiator):
+        """Start the handshake process"""
+        self.debug(f"Starting Noise XK handshake as {'initiator' if initiator else 'responder'}")
+        self.is_initiator = initiator  # Store initiator status
+        
+        if initiator:
+            # Initiator knows peer's static out-of-band
+            self._hs.initialize(
+                XKHandshakePattern(),
+                True,
+                b'',
+                s=self.keypair,
+                rs=self.peer_pubkey
+            )
+            # Generate first message
+            buf = bytearray()
+            self._hs.write_message(b'', buf)
+            self.outgoing_messages.append(bytes(buf))
+            self.debug(f"Generated handshake message 1: {len(buf)} bytes")
+        else:
+            # Responder doesn't know peer's static yet
+            self._hs.initialize(
+                XKHandshakePattern(),
+                False,
+                b'',
+                s=self.keypair
+            )
+            self.debug("Responder initialized, waiting for first message")
+    
+    def process_handshake_message(self, data):
+        """Process incoming handshake message and generate response if needed"""
+        self.debug(f"Processing handshake message: {len(data)} bytes")
+        
+        try:
+            # Read the message
+            payload = bytearray()
+            cs_pair = self._hs.read_message(data, payload)
+            
+            # Check if we need to send a response
+            if not cs_pair:
+                # More messages needed
+                buf = bytearray()
+                cs_pair = self._hs.write_message(b'', buf)
+                self.outgoing_messages.append(bytes(buf))
+                self.debug(f"Generated handshake response: {len(buf)} bytes")
+                
+                # Check if handshake completed after writing (for initiator)
+                if cs_pair:
+                    self._complete_handshake(cs_pair)
+            else:
+                # Handshake complete after reading (for responder)
+                self._complete_handshake(cs_pair)
+                
+        except Exception as e:
+            self.debug(f"Handshake error: {e}")
+            raise
+    
+    def get_next_handshake_message(self):
+        """Get next outgoing handshake message"""
+        if self.outgoing_messages:
+            return self.outgoing_messages.pop(0)
+        return None
+    
+    def encrypt(self, plaintext):
+        """Encrypt a message"""
+        if not self.handshake_complete:
+            raise RuntimeError("Handshake not complete")
+        return self._send_cs.encrypt_with_ad(b'', plaintext)
+    
+    def decrypt(self, ciphertext):
+        """Decrypt a message"""
+        if not self.handshake_complete:
+            raise RuntimeError("Handshake not complete")
+        return self._recv_cs.decrypt_with_ad(b'', ciphertext)
+    
+    def _complete_handshake(self, cs_pair):
+        """Complete the handshake with the given cipher states"""
+        self.debug("Handshake complete, setting up cipher states")
+        cs0, cs1 = cs_pair
+        
+        # Use stored initiator status
+        if self.is_initiator:
+            self._send_cs, self._recv_cs = cs0, cs1
+            self.debug("Set up cipher states as initiator")
+        else:
+            self._send_cs, self._recv_cs = cs1, cs0
+            self.debug("Set up cipher states as responder")
+        
+        self.handshake_complete = True
+        self.debug("Cipher states established")

protocol_prototype/DryBox/UI/phone_manager.py

@@ -0,0 +1,374 @@
+import secrets
+from PyQt5.QtCore import QTimer
+from protocol_phone_client import ProtocolPhoneClient
+from session import NoiseXKSession
+from phone_state import PhoneState  # Added import
+from audio_player import AudioPlayer
+from audio_processor import AudioProcessor
+import struct
+import wave
+import os
+
+class PhoneManager:
+    def __init__(self):
+        self.phones = []
+        self.handshake_done_count = 0
+        self.ui = None  # Will be set by UI
+        self.audio_player = AudioPlayer()
+        self.audio_player.set_debug_callback(self.debug)
+        self.audio_processor = AudioProcessor()
+        self.audio_processor.set_debug_callback(self.debug)
+        self.audio_buffer = {}  # client_id -> list of audio chunks for processing
+
+    def debug(self, message):
+        """Send debug message to UI if available"""
+        if self.ui and hasattr(self.ui, 'debug'):
+            self.ui.debug(f"[PhoneManager] {message}")
+        else:
+            print(f"[PhoneManager] {message}")
+    
+    def initialize_phones(self):
+        for i in range(2):
+            client = ProtocolPhoneClient(i)  # Use protocol client
+            client.set_debug_callback(self.debug)  # Set debug callback
+            client.manager = self  # Set manager reference for handshake lookup
+            keypair = NoiseXKSession.generate_keypair()
+            phone = {
+                'id': i,
+                'client': client,
+                'state': PhoneState.IDLE,
+                'number': "123-4567" if i == 0 else "987-6543",
+                'audio_timer': None,
+                'keypair': keypair,
+                'public_key': keypair.public,
+                'is_initiator': False,
+                'audio_file': None,  # For test audio
+                'frame_counter': 0,
+                'playback_enabled': False,
+                'recording_enabled': False
+            }
+            client.keypair = keypair  # Also set keypair on client
+            self.phones.append(phone)
+            self.debug(f"Initialized Phone {i+1} with public key: {keypair.public.data.hex()[:32]}...")
+
+        self.phones[0]['peer_public_key'] = self.phones[1]['public_key']
+        self.phones[1]['peer_public_key'] = self.phones[0]['public_key']
+
+    def phone_action(self, phone_id, ui_manager):
+        phone = self.phones[phone_id]
+        other_phone = self.phones[1 - phone_id]
+        self.debug(f"Phone {phone_id + 1} action triggered, current state: {phone['state'].name}")
+
+        if phone['state'] == PhoneState.IDLE:
+            self.debug(f"Phone {phone_id + 1} initiating call to Phone {2-phone_id}")
+            phone['state'] = PhoneState.CALLING
+            other_phone['state'] = PhoneState.RINGING
+            phone['is_initiator'] = True
+            other_phone['is_initiator'] = False
+            phone['client'].send("RINGING")
+        elif phone['state'] == PhoneState.RINGING:
+            self.debug(f"Phone {phone_id + 1} answering call from Phone {2-phone_id}")
+            phone['state'] = PhoneState.IN_CALL
+            # Don't set other_phone state here - let it set when it receives IN_CALL
+            phone['client'].send("IN_CALL")
+        elif phone['state'] in [PhoneState.IN_CALL, PhoneState.CALLING]:
+            if not phone['client'].state.handshake_in_progress and phone['state'] != PhoneState.CALLING:
+                phone['state'] = other_phone['state'] = PhoneState.IDLE
+                phone['client'].send("CALL_END")
+                for p in [phone, other_phone]:
+                    if p['audio_timer']:
+                        p['audio_timer'].stop()
+                    # End voice session
+                    if p['client'].voice_active:
+                        p['client'].end_voice_session()
+                    # Close audio file
+                    if p['audio_file']:
+                        p['audio_file'].close()
+                        p['audio_file'] = None
+                    p['frame_counter'] = 0
+            else:
+                self.debug(f"Phone {phone_id + 1} cannot hang up during handshake or call setup")
+        
+        ui_manager.update_phone_ui(phone_id)
+        ui_manager.update_phone_ui(1 - phone_id)
+
+    def send_audio(self, phone_id):
+        phone = self.phones[phone_id]
+        if phone['state'] != PhoneState.IN_CALL:
+            self.debug(f"Phone {phone_id + 1} not in call, stopping audio timer")
+            if phone['audio_timer']:
+                phone['audio_timer'].stop()
+            return
+            
+        if not phone['client'].handshake_complete:
+            self.debug(f"Phone {phone_id + 1} handshake not complete, skipping audio send")
+            return
+            
+        if not phone['client'].voice_active:
+            self.debug(f"Phone {phone_id + 1} voice not active, skipping audio send")
+            return
+            
+        if phone['state'] == PhoneState.IN_CALL and phone['client'].handshake_complete and phone['client'].voice_active:
+            # Load test audio file if not loaded
+            if phone['audio_file'] is None:
+                wav_path = "../wav/input.wav"
+                if not os.path.exists(wav_path):
+                    wav_path = "wav/input.wav"
+                if os.path.exists(wav_path):
+                    try:
+                        phone['audio_file'] = wave.open(wav_path, 'rb')
+                        self.debug(f"Phone {phone_id + 1} loaded test audio file: {wav_path}")
+                        # Verify it's 8kHz mono
+                        if phone['audio_file'].getframerate() != 8000:
+                            self.debug(f"Warning: {wav_path} is {phone['audio_file'].getframerate()}Hz, expected 8000Hz")
+                        if phone['audio_file'].getnchannels() != 1:
+                            self.debug(f"Warning: {wav_path} has {phone['audio_file'].getnchannels()} channels, expected 1")
+                        
+                        # Skip initial silence - jump to 1 second in (8000 samples)
+                        phone['audio_file'].setpos(8000)
+                        self.debug(f"Phone {phone_id + 1} skipped initial silence, starting at 1 second")
+                    except Exception as e:
+                        self.debug(f"Phone {phone_id + 1} failed to load audio: {e}")
+                        # Use mock audio as fallback
+                        phone['audio_file'] = None
+            
+            # Read audio frame (40ms at 8kHz = 320 samples)
+            if phone['audio_file']:
+                try:
+                    frames = phone['audio_file'].readframes(320)
+                    if not frames or len(frames) < 640:  # 320 samples * 2 bytes
+                        # Loop back to 1 second (skip silence)
+                        phone['audio_file'].setpos(8000)
+                        frames = phone['audio_file'].readframes(320)
+                        self.debug(f"Phone {phone_id + 1} looped audio back to 1 second mark")
+                    
+                    # Send through protocol (codec + 4FSK + encryption)
+                    phone['client'].send_voice_frame(frames)
+                    
+                    # Update waveform
+                    if len(frames) >= 2:
+                        samples = struct.unpack(f'{len(frames)//2}h', frames)
+                        self.update_sent_waveform(phone_id, frames)
+                    
+                    # If playback is enabled on the sender, play the original audio
+                    if phone['playback_enabled']:
+                        self.audio_player.add_audio_data(phone_id, frames)
+                        if phone['frame_counter'] % 25 == 0:
+                            self.debug(f"Phone {phone_id + 1} playing original audio (sender playback)")
+                    
+                    phone['frame_counter'] += 1
+                    if phone['frame_counter'] % 25 == 0:  # Log every second
+                        self.debug(f"Phone {phone_id + 1} sent {phone['frame_counter']} voice frames")
+                        
+                except Exception as e:
+                    self.debug(f"Phone {phone_id + 1} audio send error: {e}")
+            else:
+                # Fallback: send mock audio
+                mock_audio = secrets.token_bytes(320)
+                phone['client'].send_voice_frame(mock_audio)
+                self.update_sent_waveform(phone_id, mock_audio)
+
+    def start_audio(self, client_id, parent=None):
+        self.handshake_done_count += 1
+        self.debug(f"HANDSHAKE_DONE received for client {client_id}, count: {self.handshake_done_count}")
+        
+        # Start voice session for this client
+        phone = self.phones[client_id]
+        if phone['client'].handshake_complete and not phone['client'].voice_active:
+            phone['client'].start_voice_session()
+        
+        if self.handshake_done_count == 2:
+            # Add a small delay to ensure both sides are ready
+            def start_audio_timers():
+                self.debug("Starting audio timers for both phones")
+                for phone in self.phones:
+                    if phone['state'] == PhoneState.IN_CALL:
+                        if not phone['audio_timer'] or not phone['audio_timer'].isActive():
+                            phone['audio_timer'] = QTimer(parent)  # Parent to PhoneUI
+                            phone['audio_timer'].timeout.connect(lambda pid=phone['id']: self.send_audio(pid))
+                            phone['audio_timer'].start(40)  # 40ms for each voice frame
+            
+            # Delay audio start by 500ms to ensure both sides are ready
+            QTimer.singleShot(500, start_audio_timers)
+            self.handshake_done_count = 0
+
+    def update_waveform(self, client_id, data):
+        # Only process actual audio data (should be 640 bytes for 320 samples * 2 bytes)
+        # Ignore small control messages
+        if len(data) < 320:  # Less than 160 samples (too small for audio)
+            self.debug(f"Phone {client_id + 1} received non-audio data: {len(data)} bytes (ignoring)")
+            return
+            
+        self.phones[client_id]['waveform'].set_data(data)
+        
+        # Debug log audio data reception (only occasionally to avoid spam)
+        if not hasattr(self, '_audio_frame_count'):
+            self._audio_frame_count = {}
+        if client_id not in self._audio_frame_count:
+            self._audio_frame_count[client_id] = 0
+        self._audio_frame_count[client_id] += 1
+        
+        if self._audio_frame_count[client_id] == 1 or self._audio_frame_count[client_id] % 25 == 0:
+            self.debug(f"Phone {client_id + 1} received audio frame #{self._audio_frame_count[client_id]}: {len(data)} bytes")
+        
+        # Store audio data in buffer for potential processing
+        if client_id not in self.audio_buffer:
+            self.audio_buffer[client_id] = []
+        self.audio_buffer[client_id].append(data)
+        
+        # Keep buffer size reasonable (last 30 seconds at 8kHz)
+        max_chunks = 30 * 25  # 30 seconds * 25 chunks/second
+        if len(self.audio_buffer[client_id]) > max_chunks:
+            self.audio_buffer[client_id] = self.audio_buffer[client_id][-max_chunks:]
+        
+        # Forward audio data to player if playback is enabled
+        if self.phones[client_id]['playback_enabled']:
+            if self._audio_frame_count[client_id] == 1:
+                self.debug(f"Phone {client_id + 1} forwarding audio to player (playback enabled)")
+            self.audio_player.add_audio_data(client_id, data)
+
+    def update_sent_waveform(self, client_id, data):
+        self.phones[client_id]['sent_waveform'].set_data(data)
+    
+    def toggle_playback(self, client_id):
+        """Toggle audio playback for a phone"""
+        phone = self.phones[client_id]
+        
+        if phone['playback_enabled']:
+            # Stop playback
+            self.audio_player.stop_playback(client_id)
+            phone['playback_enabled'] = False
+            self.debug(f"Phone {client_id + 1} playback stopped")
+        else:
+            # Start playback
+            if self.audio_player.start_playback(client_id):
+                phone['playback_enabled'] = True
+                self.debug(f"Phone {client_id + 1} playback started")
+                # Removed test beep - we want to hear actual audio
+            else:
+                self.debug(f"Phone {client_id + 1} failed to start playback")
+        
+        return phone['playback_enabled']
+    
+    def toggle_recording(self, client_id):
+        """Toggle audio recording for a phone"""
+        phone = self.phones[client_id]
+        
+        if phone['recording_enabled']:
+            # Stop recording and save
+            save_path = self.audio_player.stop_recording(client_id)
+            phone['recording_enabled'] = False
+            if save_path:
+                self.debug(f"Phone {client_id + 1} recording saved to {save_path}")
+            return False, save_path
+        else:
+            # Start recording
+            self.audio_player.start_recording(client_id)
+            phone['recording_enabled'] = True
+            self.debug(f"Phone {client_id + 1} recording started")
+            return True, None
+    
+    def save_received_audio(self, client_id, filename=None):
+        """Save the last received audio to a file"""
+        if client_id not in self.phones:
+            return None
+            
+        save_path = self.audio_player.stop_recording(client_id, filename)
+        if save_path:
+            self.debug(f"Phone {client_id + 1} audio saved to {save_path}")
+        return save_path
+
+    def process_audio(self, client_id, processing_type, **kwargs):
+        """Process buffered audio with specified processing type"""
+        if client_id not in self.audio_buffer or not self.audio_buffer[client_id]:
+            self.debug(f"No audio data available for Phone {client_id + 1}")
+            return None
+        
+        # Combine all audio chunks
+        combined_audio = b''.join(self.audio_buffer[client_id])
+        
+        # Apply processing based on type
+        processed_audio = combined_audio
+        
+        if processing_type == "normalize":
+            target_db = kwargs.get('target_db', -3)
+            processed_audio = self.audio_processor.normalize_audio(combined_audio, target_db)
+        
+        elif processing_type == "gain":
+            gain_db = kwargs.get('gain_db', 0)
+            processed_audio = self.audio_processor.apply_gain(combined_audio, gain_db)
+        
+        elif processing_type == "noise_gate":
+            threshold_db = kwargs.get('threshold_db', -40)
+            processed_audio = self.audio_processor.apply_noise_gate(combined_audio, threshold_db)
+        
+        elif processing_type == "low_pass":
+            cutoff_hz = kwargs.get('cutoff_hz', 3400)
+            processed_audio = self.audio_processor.apply_low_pass_filter(combined_audio, cutoff_hz)
+        
+        elif processing_type == "high_pass":
+            cutoff_hz = kwargs.get('cutoff_hz', 300)
+            processed_audio = self.audio_processor.apply_high_pass_filter(combined_audio, cutoff_hz)
+        
+        elif processing_type == "remove_silence":
+            threshold_db = kwargs.get('threshold_db', -40)
+            processed_audio = self.audio_processor.remove_silence(combined_audio, threshold_db)
+        
+        # Save processed audio
+        save_path = f"wav/phone{client_id + 1}_received.wav"
+        processed_path = self.audio_processor.save_processed_audio(
+            processed_audio, save_path, processing_type
+        )
+        
+        return processed_path
+    
+    def export_buffered_audio(self, client_id, filename=None):
+        """Export current audio buffer to file"""
+        if client_id not in self.audio_buffer or not self.audio_buffer[client_id]:
+            self.debug(f"No audio data available for Phone {client_id + 1}")
+            return None
+        
+        # Combine all audio chunks
+        combined_audio = b''.join(self.audio_buffer[client_id])
+        
+        # Generate filename if not provided
+        if not filename:
+            from datetime import datetime
+            timestamp = datetime.now().strftime("%Y%m%d_%H%M%S")
+            filename = f"wav/phone{client_id + 1}_buffer_{timestamp}.wav"
+        
+        # Ensure directory exists
+        os.makedirs(os.path.dirname(filename), exist_ok=True)
+        
+        try:
+            with wave.open(filename, 'wb') as wav_file:
+                wav_file.setnchannels(1)
+                wav_file.setsampwidth(2)
+                wav_file.setframerate(8000)
+                wav_file.writeframes(combined_audio)
+            
+            self.debug(f"Exported audio buffer for Phone {client_id + 1} to {filename}")
+            return filename
+            
+        except Exception as e:
+            self.debug(f"Failed to export audio buffer: {e}")
+            return None
+    
+    def clear_audio_buffer(self, client_id):
+        """Clear audio buffer for a phone"""
+        if client_id in self.audio_buffer:
+            self.audio_buffer[client_id] = []
+            self.debug(f"Cleared audio buffer for Phone {client_id + 1}")
+
+    def map_state(self, state_str):
+        if state_str == "RINGING":
+            return PhoneState.RINGING
+        elif state_str in ["CALL_END", "CALL_DROPPED"]:
+            return PhoneState.IDLE
+        elif state_str == "IN_CALL":
+            return PhoneState.IN_CALL
+        elif state_str == "HANDSHAKE":
+            return PhoneState.IN_CALL
+        elif state_str == "HANDSHAKE_DONE":
+            return PhoneState.IN_CALL
+        return PhoneState.IDLE

protocol_prototype/DryBox/UI/phone_state.py

@@ -0,0 +1,7 @@
+from enum import Enum
+
+class PhoneState(Enum):
+    IDLE = 0
+    CALLING = 1
+    IN_CALL = 2
+    RINGING = 3

protocol_prototype/DryBox/UI/protocol_client_state.py

@@ -0,0 +1,133 @@
+# protocol_client_state.py
+from queue import Queue
+from session import NoiseXKSession
+import time
+
+class ProtocolClientState:
+    """Enhanced client state for integrated protocol with voice codec"""
+    
+    def __init__(self, client_id):
+        self.client_id = client_id
+        self.command_queue = Queue()
+        self.initiator = None
+        self.keypair = None
+        self.peer_pubkey = None
+        self.session = None
+        self.handshake_in_progress = False
+        self.handshake_start_time = None
+        self.call_active = False
+        self.voice_active = False
+        self.debug_callback = None
+    
+    def debug(self, message):
+        """Send debug message"""
+        if self.debug_callback:
+            self.debug_callback(f"[State{self.client_id+1}] {message}")
+        else:
+            print(f"[State{self.client_id+1}] {message}")
+        
+    def process_command(self, client):
+        """Process commands from the queue."""
+        if not self.command_queue.empty():
+            self.debug(f"Processing command queue, size: {self.command_queue.qsize()}")
+            command = self.command_queue.get()
+            self.debug(f"Processing command: {command}")
+            
+            if command == "handshake":
+                # Handshake is now handled by the wrapper in the client
+                self.debug(f"Handshake command processed")
+                self.handshake_in_progress = False
+                self.handshake_start_time = None
+                    
+            elif command == "start_voice":
+                if client.handshake_complete:
+                    client.start_voice_session()
+                    self.voice_active = True
+                    
+            elif command == "end_voice":
+                if self.voice_active:
+                    client.end_voice_session()
+                    self.voice_active = False
+    
+    def start_handshake(self, initiator, keypair, peer_pubkey):
+        """Queue handshake command."""
+        self.initiator = initiator
+        self.keypair = keypair
+        self.peer_pubkey = peer_pubkey
+        self.debug(f"Queuing handshake, initiator: {initiator}")
+        self.handshake_in_progress = True
+        self.handshake_start_time = time.time()
+        self.command_queue.put("handshake")
+    
+    def handle_data(self, client, data):
+        """Handle received data (control or audio)."""
+        try:
+            # Try to decode as text first
+            decoded_data = data.decode('utf-8').strip()
+            self.debug(f"Received raw: {decoded_data}")
+            
+            # Handle control messages
+            if decoded_data in ["RINGING", "CALL_END", "CALL_DROPPED", "IN_CALL", "HANDSHAKE", "HANDSHAKE_DONE"]:
+                self.debug(f"Emitting state change: {decoded_data}")
+                # Log which client is receiving what
+                self.debug(f"Client {self.client_id} received {decoded_data} message")
+                client.state_changed.emit(decoded_data, decoded_data, self.client_id)
+                
+                if decoded_data == "IN_CALL":
+                    self.debug(f"Received IN_CALL, setting call_active = True")
+                    self.call_active = True
+                elif decoded_data == "HANDSHAKE":
+                    self.debug(f"Received HANDSHAKE, setting handshake_in_progress = True")
+                    self.handshake_in_progress = True
+                elif decoded_data == "HANDSHAKE_DONE":
+                    self.debug(f"Received HANDSHAKE_DONE from peer")
+                    self.call_active = True
+                    # Start voice session on this side too
+                    if client.handshake_complete and not client.voice_active:
+                        self.debug(f"Starting voice session after receiving HANDSHAKE_DONE")
+                        self.command_queue.put("start_voice")
+                elif decoded_data in ["CALL_END", "CALL_DROPPED"]:
+                    self.debug(f"Received {decoded_data}, ending call")
+                    self.call_active = False
+                    if self.voice_active:
+                        self.command_queue.put("end_voice")
+            else:
+                self.debug(f"Ignored unexpected text message: {decoded_data}")
+                
+        except UnicodeDecodeError:
+            # Handle binary data (protocol messages or encrypted data)
+            if len(data) > 0 and data[0] == 0x20 and not client.handshake_complete:  # Noise handshake message only before handshake completes
+                self.debug(f"Received Noise handshake message")
+                # Initialize responder if not already done
+                if not client.handshake_initiated:
+                    # Find the other phone's public key
+                    # This is a bit hacky but works for our 2-phone setup
+                    manager = getattr(client, 'manager', None)
+                    if manager:
+                        other_phone = manager.phones[1 - self.client_id]
+                        client.start_handshake(initiator=False, 
+                                             keypair=client.keypair or manager.phones[self.client_id]['keypair'],
+                                             peer_pubkey=other_phone['public_key'])
+                # Pass to protocol handler
+                client._handle_protocol_message(data)
+            elif client.handshake_complete and client.noise_wrapper:
+                # Pass encrypted data back to client for decryption
+                client._handle_encrypted_data(data)
+            else:
+                # Pass other binary messages to protocol handler only if not yet complete
+                if not client.handshake_complete:
+                    client._handle_protocol_message(data)
+    
+    def check_handshake_timeout(self, client):
+        """Check for handshake timeout."""
+        if self.handshake_in_progress and self.handshake_start_time:
+            if time.time() - self.handshake_start_time > 30:
+                self.debug(f"Handshake timeout after 30s")
+                client.state_changed.emit("CALL_END", "", self.client_id)
+                self.handshake_in_progress = False
+                self.handshake_start_time = None
+                
+    def queue_voice_command(self, command):
+        """Queue voice-related commands"""
+        if command in ["start_voice", "end_voice"]:
+            self.command_queue.put(command)

protocol_prototype/DryBox/UI/protocol_phone_client.py

@@ -0,0 +1,456 @@
+import socket
+import time
+import select
+import struct
+import array
+from PyQt5.QtCore import QThread, pyqtSignal
+from protocol_client_state import ProtocolClientState
+from session import NoiseXKSession
+from noise_wrapper import NoiseXKWrapper
+from dissononce.dh.keypair import KeyPair
+from dissononce.dh.x25519.public import PublicKey
+import sys
+import os
+sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
+from voice_codec import Codec2Wrapper, FSKModem, Codec2Mode
+# ChaCha20 removed - using only Noise XK encryption
+
+class ProtocolPhoneClient(QThread):
+    """Integrated phone client with Noise XK, Codec2, 4FSK, and ChaCha20"""
+    data_received = pyqtSignal(bytes, int)
+    state_changed = pyqtSignal(str, str, int)
+    
+    def __init__(self, client_id):
+        super().__init__()
+        self.host = "localhost"
+        self.port = 12345
+        self.client_id = client_id
+        self.sock = None
+        self.running = True
+        self.state = ProtocolClientState(client_id)
+        
+        # Noise XK session
+        self.noise_session = None
+        self.noise_wrapper = None
+        self.handshake_complete = False
+        self.handshake_initiated = False
+        
+        # No buffer needed with larger frame size
+        
+        # Voice codec components
+        self.codec = Codec2Wrapper(mode=Codec2Mode.MODE_1200)
+        self.modem = FSKModem()
+        
+        # Voice encryption handled by Noise XK
+        # No separate voice key needed
+        
+        # Voice state
+        self.voice_active = False
+        self.voice_frame_counter = 0
+        
+        # Message buffer for fragmented messages
+        self.recv_buffer = bytearray()
+        
+        # Debug callback
+        self.debug_callback = None
+    
+    def set_debug_callback(self, callback):
+        """Set debug callback function"""
+        self.debug_callback = callback
+        self.state.debug_callback = callback
+    
+    def debug(self, message):
+        """Send debug message"""
+        if self.debug_callback:
+            self.debug_callback(f"[Phone{self.client_id+1}] {message}")
+        else:
+            print(f"[Phone{self.client_id+1}] {message}")
+        
+    def connect_socket(self):
+        retries = 3
+        for attempt in range(retries):
+            try:
+                self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+                self.sock.setsockopt(socket.SOL_SOCKET, socket.SO_KEEPALIVE, 1)
+                self.sock.settimeout(120)
+                self.sock.connect((self.host, self.port))
+                self.debug(f"Connected to GSM simulator at {self.host}:{self.port}")
+                return True
+            except Exception as e:
+                self.debug(f"Connection attempt {attempt + 1} failed: {e}")
+                if attempt < retries - 1:
+                    time.sleep(1)
+                self.sock = None
+        return False
+    
+    def run(self):
+        while self.running:
+            if not self.sock:
+                if not self.connect_socket():
+                    self.debug("Failed to connect after retries")
+                    self.state_changed.emit("CALL_END", "", self.client_id)
+                    break
+            try:
+                while self.running:
+                    self.state.process_command(self)
+                    self.state.check_handshake_timeout(self)
+                    
+                    if self.handshake_complete and self.voice_active:
+                        # Process voice data if active
+                        self._process_voice_data()
+                    
+                    # Always check for incoming data, even during handshake
+                    if self.sock is None:
+                        break
+                    readable, _, _ = select.select([self.sock], [], [], 0.01)
+                    if readable:
+                        try:
+                            if self.sock is None:
+                                break
+                            chunk = self.sock.recv(4096)
+                            if not chunk:
+                                self.debug("Disconnected from server")
+                                self.state_changed.emit("CALL_END", "", self.client_id)
+                                break
+                            
+                            # Add to buffer
+                            self.recv_buffer.extend(chunk)
+                            
+                            # Process complete messages
+                            while len(self.recv_buffer) >= 4:
+                                # Read message length
+                                msg_len = struct.unpack('>I', self.recv_buffer[:4])[0]
+                                
+                                # Check if we have the complete message
+                                if len(self.recv_buffer) >= 4 + msg_len:
+                                    # Extract message
+                                    data = bytes(self.recv_buffer[4:4+msg_len])
+                                    # Remove from buffer
+                                    self.recv_buffer = self.recv_buffer[4+msg_len:]
+                                    # Pass to state handler
+                                    self.state.handle_data(self, data)
+                                else:
+                                    # Wait for more data
+                                    break
+                                    
+                        except socket.error as e:
+                            self.debug(f"Socket error: {e}")
+                            self.state_changed.emit("CALL_END", "", self.client_id)
+                            break
+                    
+                    self.msleep(1)
+            except Exception as e:
+                self.debug(f"Unexpected error in run loop: {e}")
+                self.state_changed.emit("CALL_END", "", self.client_id)
+                break
+            finally:
+                if self.sock:
+                    try:
+                        self.sock.close()
+                    except Exception as e:
+                        self.debug(f"Error closing socket: {e}")
+                    self.sock = None
+    
+    def _handle_encrypted_data(self, data):
+        """Handle encrypted data after handshake"""
+        if not self.handshake_complete or not self.noise_wrapper:
+            self.debug(f"Cannot decrypt - handshake not complete")
+            return
+            
+        # All data after handshake is encrypted, decrypt it first
+        try:
+            plaintext = self.noise_wrapper.decrypt(data)
+            
+            # Check if it's a text message
+            try:
+                text_msg = plaintext.decode('utf-8').strip()
+                if text_msg == "HANDSHAKE_DONE":
+                    self.debug(f"Received encrypted HANDSHAKE_DONE")
+                    self.state_changed.emit("HANDSHAKE_DONE", "HANDSHAKE_DONE", self.client_id)
+                    return
+            except:
+                pass
+                
+            # Otherwise handle as protocol message
+            self._handle_protocol_message(plaintext)
+        except Exception as e:
+            # Suppress common decryption errors
+            pass
+    
+    def _handle_protocol_message(self, plaintext):
+        """Handle decrypted protocol messages"""
+        if len(plaintext) < 1:
+            return
+            
+        msg_type = plaintext[0]
+        msg_data = plaintext[1:]
+        
+        if msg_type == 0x10:  # Voice start
+            self.debug("Received VOICE_START message")
+            self._handle_voice_start(msg_data)
+        elif msg_type == 0x11:  # Voice data
+            self._handle_voice_data(msg_data)
+        elif msg_type == 0x12:  # Voice end
+            self.debug("Received VOICE_END message")
+            self._handle_voice_end(msg_data)
+        elif msg_type == 0x20:  # Noise handshake
+            self.debug("Received NOISE_HS message")
+            self._handle_noise_handshake(msg_data)
+        else:
+            self.debug(f"Received unknown protocol message type: 0x{msg_type:02x}")
+            # Don't emit control messages to data_received - that's only for audio
+            # Control messages should be handled via state_changed signal
+    
+    def _handle_voice_start(self, data):
+        """Handle voice session start"""
+        self.debug("Voice session started by peer")
+        self.voice_active = True
+        self.voice_frame_counter = 0
+        self.state_changed.emit("VOICE_START", "", self.client_id)
+    
+    def _handle_voice_data(self, data):
+        """Handle voice frame (already decrypted by Noise)"""
+        if len(data) < 4:
+            return
+            
+        try:
+            # Data is float array packed as bytes
+            # Unpack the float array
+            num_floats = len(data) // 4
+            modulated_signal = struct.unpack(f'{num_floats}f', data)
+            
+            # Demodulate FSK
+            demodulated_data, confidence = self.modem.demodulate(modulated_signal)
+            
+            if confidence > 0.5:  # Only decode if confidence is good
+                # Create Codec2Frame from demodulated data
+                from voice_codec import Codec2Frame, Codec2Mode
+                frame = Codec2Frame(
+                    mode=Codec2Mode.MODE_1200,
+                    bits=demodulated_data,
+                    timestamp=time.time(),
+                    frame_number=self.voice_frame_counter
+                )
+                
+                # Decode with Codec2
+                pcm_samples = self.codec.decode(frame)
+                
+                if self.voice_frame_counter == 0:
+                    self.debug(f"First voice frame demodulated with confidence {confidence:.2f}")
+                
+                # Send PCM to UI for playback
+                if pcm_samples is not None and len(pcm_samples) > 0:
+                    # Only log details for first frame and every 25th frame
+                    if self.voice_frame_counter == 0 or self.voice_frame_counter % 25 == 0:
+                        self.debug(f"Decoded PCM samples: type={type(pcm_samples)}, len={len(pcm_samples)}")
+                    
+                    # Convert to bytes if needed
+                    if hasattr(pcm_samples, 'tobytes'):
+                        pcm_bytes = pcm_samples.tobytes()
+                    elif isinstance(pcm_samples, (list, array.array)):
+                        # Convert array to bytes
+                        import array
+                        if isinstance(pcm_samples, list):
+                            pcm_array = array.array('h', pcm_samples)
+                            pcm_bytes = pcm_array.tobytes()
+                        else:
+                            pcm_bytes = pcm_samples.tobytes()
+                    else:
+                        pcm_bytes = bytes(pcm_samples)
+                    
+                    if self.voice_frame_counter == 0:
+                        self.debug(f"Emitting first PCM frame: {len(pcm_bytes)} bytes")
+                    
+                    self.data_received.emit(pcm_bytes, self.client_id)
+                    self.voice_frame_counter += 1
+                    # Log frame reception periodically
+                    if self.voice_frame_counter == 1 or self.voice_frame_counter % 25 == 0:
+                        self.debug(f"Received voice data frame #{self.voice_frame_counter}")
+                else:
+                    self.debug(f"Codec decode returned None or empty")
+            else:
+                if self.voice_frame_counter % 10 == 0:
+                    self.debug(f"Low confidence demodulation: {confidence:.2f}")
+                    
+        except Exception as e:
+            self.debug(f"Voice decode error: {e}")
+    
+    def _handle_voice_end(self, data):
+        """Handle voice session end"""
+        self.debug("Voice session ended by peer")
+        self.voice_active = False
+        self.state_changed.emit("VOICE_END", "", self.client_id)
+    
+    def _handle_noise_handshake(self, data):
+        """Handle Noise handshake message"""
+        if not self.noise_wrapper:
+            self.debug("Received handshake message but no wrapper initialized")
+            return
+            
+        try:
+            # Process the handshake message
+            self.noise_wrapper.process_handshake_message(data)
+            
+            # Check if we need to send a response
+            response = self.noise_wrapper.get_next_handshake_message()
+            if response:
+                self.send(b'\x20' + response)
+                
+            # Check if handshake is complete
+            if self.noise_wrapper.handshake_complete and not self.handshake_complete:
+                self.debug("Noise wrapper handshake complete, calling complete_handshake()")
+                self.complete_handshake()
+                
+        except Exception as e:
+            self.debug(f"Handshake processing error: {e}")
+            self.state_changed.emit("CALL_END", "", self.client_id)
+    
+    def _process_voice_data(self):
+        """Process outgoing voice data"""
+        # This would be called when we have voice input to send
+        # For now, this is a placeholder
+        pass
+    
+    def send_voice_frame(self, pcm_samples):
+        """Send a voice frame through the protocol"""
+        if not self.handshake_complete:
+            self.debug("Cannot send voice - handshake not complete")
+            return
+        if not self.voice_active:
+            self.debug("Cannot send voice - voice session not active")
+            return
+            
+        try:
+            # Encode with Codec2
+            codec_frame = self.codec.encode(pcm_samples)
+            if not codec_frame:
+                return
+            
+            if self.voice_frame_counter % 25 == 0:  # Log every 25 frames (1 second)
+                self.debug(f"Encoding voice frame #{self.voice_frame_counter}: {len(pcm_samples)} bytes PCM → {len(codec_frame.bits)} bytes compressed")
+                
+            # Modulate with FSK
+            modulated_data = self.modem.modulate(codec_frame.bits)
+            
+            # Convert modulated float array to bytes
+            modulated_bytes = struct.pack(f'{len(modulated_data)}f', *modulated_data)
+            
+            if self.voice_frame_counter % 25 == 0:
+                self.debug(f"Voice frame size: {len(modulated_bytes)} bytes")
+            
+            # Build voice data message (no ChaCha20, will be encrypted by Noise)
+            msg = bytes([0x11]) + modulated_bytes
+            
+            # Send through Noise encrypted channel
+            self.send(msg)
+            
+            self.voice_frame_counter += 1
+            
+        except Exception as e:
+            self.debug(f"Voice encode error: {e}")
+    
+    def send(self, message):
+        """Send data through Noise encrypted channel with proper framing"""
+        if self.sock and self.running:
+            try:
+                # Handshake messages (0x20) bypass Noise encryption
+                if isinstance(message, bytes) and len(message) > 0 and message[0] == 0x20:
+                    # Add length prefix for framing
+                    framed = struct.pack('>I', len(message)) + message
+                    self.sock.send(framed)
+                    return
+                
+                if self.handshake_complete and self.noise_wrapper:
+                    # Encrypt everything with Noise after handshake
+                    # Convert string to bytes if needed
+                    if isinstance(message, str):
+                        message = message.encode('utf-8')
+                    encrypted = self.noise_wrapper.encrypt(message)
+                    # Add length prefix for framing
+                    framed = struct.pack('>I', len(encrypted)) + encrypted
+                    self.sock.send(framed)
+                else:
+                    # During handshake, send raw with framing
+                    if isinstance(message, str):
+                        data = message.encode('utf-8')
+                        framed = struct.pack('>I', len(data)) + data
+                        self.sock.send(framed)
+                        self.debug(f"Sent control message: {message}")
+                    else:
+                        framed = struct.pack('>I', len(message)) + message
+                        self.sock.send(framed)
+            except socket.error as e:
+                self.debug(f"Send error: {e}")
+                self.state_changed.emit("CALL_END", "", self.client_id)
+    
+    def stop(self):
+        self.running = False
+        self.voice_active = False
+        if self.sock:
+            try:
+                self.sock.close()
+            except Exception as e:
+                self.debug(f"Error closing socket in stop: {e}")
+            self.sock = None
+        self.quit()
+        self.wait(1000)
+    
+    def start_handshake(self, initiator, keypair, peer_pubkey):
+        """Start Noise XK handshake"""
+        self.debug(f"Starting Noise XK handshake as {'initiator' if initiator else 'responder'}")
+        self.debug(f"Our public key: {keypair.public.data.hex()[:32]}...")
+        self.debug(f"Peer public key: {peer_pubkey.data.hex()[:32]}...")
+        
+        # Create noise wrapper
+        self.noise_wrapper = NoiseXKWrapper(keypair, peer_pubkey, self.debug)
+        self.noise_wrapper.start_handshake(initiator)
+        self.handshake_initiated = True
+        
+        # Send first handshake message if initiator
+        if initiator:
+            msg = self.noise_wrapper.get_next_handshake_message()
+            if msg:
+                # Send as NOISE_HS message type
+                self.send(b'\x20' + msg)  # 0x20 = Noise handshake message
+    
+    def complete_handshake(self):
+        """Called when Noise handshake completes"""
+        self.handshake_complete = True
+        
+        self.debug("Noise XK handshake complete!")
+        self.debug("Secure channel established")
+        
+        # Send HANDSHAKE_DONE message
+        self.send("HANDSHAKE_DONE")
+        
+        self.state_changed.emit("HANDSHAKE_COMPLETE", "", self.client_id)
+    
+    def start_voice_session(self):
+        """Start a voice session"""
+        if not self.handshake_complete:
+            self.debug("Cannot start voice - handshake not complete")
+            return
+            
+        self.voice_active = True
+        self.voice_frame_counter = 0
+        
+        # Send voice start message
+        msg = bytes([0x10])  # Voice start message type
+        self.send(msg)
+        
+        self.debug("Voice session started")
+        self.state_changed.emit("VOICE_START", "", self.client_id)
+    
+    def end_voice_session(self):
+        """End a voice session"""
+        if not self.voice_active:
+            return
+            
+        self.voice_active = False
+        
+        # Send voice end message
+        msg = bytes([0x12])  # Voice end message type
+        self.send(msg)
+        
+        self.debug("Voice session ended")
+        self.state_changed.emit("VOICE_END", "", self.client_id)

protocol_prototype/DryBox/UI/session.py

@@ -0,0 +1,196 @@
+import socket
+import logging
+from dissononce.processing.impl.handshakestate import HandshakeState
+from dissononce.processing.impl.symmetricstate import SymmetricState
+from dissononce.processing.impl.cipherstate import CipherState
+from dissononce.processing.handshakepatterns.interactive.XK import XKHandshakePattern
+from dissononce.cipher.chachapoly import ChaChaPolyCipher
+from dissononce.dh.x25519.x25519 import X25519DH
+from dissononce.dh.keypair import KeyPair
+from dissononce.dh.x25519.public import PublicKey
+from dissononce.hash.sha256 import SHA256Hash
+
+# Configure logging - disabled by default to avoid noise
+# logging.basicConfig(level=logging.DEBUG, format="%(message)s")
+
+class NoiseXKSession:
+    @staticmethod
+    def generate_keypair() -> KeyPair:
+        """
+        Generate a static X25519 KeyPair.
+        Returns:
+            KeyPair object with .private and .public attributes.
+        """
+        return X25519DH().generate_keypair()
+
+    def __init__(self, local_kp: KeyPair, peer_pubkey: PublicKey):
+        """
+        Initialize with our KeyPair and the peer's PublicKey.
+        """
+        self.local_kp: KeyPair = local_kp
+        self.peer_pubkey: PublicKey = peer_pubkey
+
+        # Build the Noise handshake state (X25519 DH, ChaChaPoly cipher, SHA256 hash)
+        cipher = ChaChaPolyCipher()
+        dh = X25519DH()
+        hshash = SHA256Hash()
+        symmetric = SymmetricState(CipherState(cipher), hshash)
+        self._hs = HandshakeState(symmetric, dh)
+
+        self._send_cs = None  # type: CipherState
+        self._recv_cs = None
+
+    def handshake(self, sock: socket.socket, initiator: bool) -> None:
+        """
+        Perform the XK handshake over the socket. Branches on initiator/responder
+        so that each side reads or writes in the correct message order.
+        On completion, self._send_cs and self._recv_cs hold the two CipherStates.
+        """
+        # logging.debug(f"[handshake] start (initiator={initiator})")
+        # initialize with our KeyPair and their PublicKey
+        if initiator:
+            # initiator knows peer’s static out-of-band
+            self._hs.initialize(
+                XKHandshakePattern(),
+                True,
+                b'',
+                s=self.local_kp,
+                rs=self.peer_pubkey
+            )
+        else:
+            # logging.debug("[handshake] responder initializing without rs")
+            # responder must NOT supply rs here
+            self._hs.initialize(
+                XKHandshakePattern(),
+                False,
+                b'',
+                s=self.local_kp
+            )
+
+        cs_pair = None
+        if initiator:
+            # 1) -> e
+            buf1 = bytearray()
+            cs_pair = self._hs.write_message(b'', buf1)
+            # logging.debug(f"[-> e] {buf1.hex()}")
+            self._send_all(sock, buf1)
+
+            # 2) <- e, es, s, ss
+            msg2 = self._recv_all(sock)
+            # logging.debug(f"[<- msg2] {msg2.hex()}")
+            self._hs.read_message(msg2, bytearray())
+
+            # 3) -> se (final)
+            buf3 = bytearray()
+            cs_pair = self._hs.write_message(b'', buf3)
+            # logging.debug(f"[-> se] {buf3.hex()}")
+            self._send_all(sock, buf3)
+        else:
+            # 1) <- e
+            msg1 = self._recv_all(sock)
+            # logging.debug(f"[<- e] {msg1.hex()}")
+            self._hs.read_message(msg1, bytearray())
+
+            # 2) -> e, es, s, ss
+            buf2 = bytearray()
+            cs_pair = self._hs.write_message(b'', buf2)
+            # logging.debug(f"[-> msg2] {buf2.hex()}")
+            self._send_all(sock, buf2)
+
+            # 3) <- se (final)
+            msg3 = self._recv_all(sock)
+            # logging.debug(f"[<- se] {msg3.hex()}")
+            cs_pair = self._hs.read_message(msg3, bytearray())
+
+        # on the final step, we must get exactly two CipherStates
+        if not cs_pair or len(cs_pair) != 2:
+            raise RuntimeError("Handshake did not complete properly")
+        cs0, cs1 = cs_pair
+        # the library returns (cs_encrypt_for_initiator, cs_decrypt_for_initiator)
+        if initiator:
+            # initiator: cs0 encrypts, cs1 decrypts
+            self._send_cs, self._recv_cs = cs0, cs1
+        else:
+            # responder must swap
+            self._send_cs, self._recv_cs = cs1, cs0
+
+        # dump the raw symmetric keys & nonces (if available)
+        self._dump_cipherstate("HANDSHAKE→ SEND", self._send_cs)
+        self._dump_cipherstate("HANDSHAKE→ RECV", self._recv_cs)
+
+    def send(self, sock: socket.socket, plaintext: bytes) -> None:
+        """
+        Encrypt and send a message.
+        """
+        if self._send_cs is None:
+            raise RuntimeError("Handshake not complete")
+        ct = self._send_cs.encrypt_with_ad(b'', plaintext)
+        logging.debug(f"[ENCRYPT] {ct.hex()}")
+        # self._dump_cipherstate("SEND→ after encrypt", self._send_cs)
+        self._send_all(sock, ct)
+
+    def receive(self, sock: socket.socket) -> bytes:
+        """
+        Receive and decrypt a message.
+        """
+        if self._recv_cs is None:
+            raise RuntimeError("Handshake not complete")
+        ct = self._recv_all(sock)
+        logging.debug(f"[CIPHERTEXT] {ct.hex()}")
+        # self._dump_cipherstate("RECV→ before decrypt", self._recv_cs)
+        pt = self._recv_cs.decrypt_with_ad(b'', ct)
+        logging.debug(f"[DECRYPT] {pt!r}")
+        return pt
+
+    def decrypt(self, ciphertext: bytes) -> bytes:
+        """
+        Decrypt a ciphertext received as bytes.
+        """
+        if self._recv_cs is None:
+            raise RuntimeError("Handshake not complete")
+        # Remove 2-byte length prefix if present
+        if len(ciphertext) >= 2 and int.from_bytes(ciphertext[:2], 'big') == len(ciphertext) - 2:
+            logging.debug(f"[DECRYPT] Stripping 2-byte length prefix from {len(ciphertext)}-byte input")
+            ciphertext = ciphertext[2:]
+        logging.debug(f"[CIPHERTEXT] {ciphertext.hex()}")
+        # self._dump_cipherstate("DECRYPT→ before decrypt", self._recv_cs)
+        pt = self._recv_cs.decrypt_with_ad(b'', ciphertext)
+        logging.debug(f"[DECRYPT] {pt!r}")
+        return pt
+
+    def _send_all(self, sock: socket.socket, data: bytes) -> None:
+        # Length-prefix (2 bytes big-endian) + data
+        length = len(data).to_bytes(2, 'big')
+        logging.debug(f"[SEND] length={length.hex()}, data={data.hex()}")
+        sock.sendall(length + data)
+
+    def _recv_all(self, sock: socket.socket) -> bytes:
+        # Read 2-byte length prefix, then the payload
+        hdr = self._read_exact(sock, 2)
+        length = int.from_bytes(hdr, 'big')
+        # logging.debug(f"[RECV] length={length} ({hdr.hex()})")
+        data = self._read_exact(sock, length)
+        # logging.debug(f"[RECV] data={data.hex()}")
+        return data
+
+    @staticmethod
+    def _read_exact(sock: socket.socket, n: int) -> bytes:
+        buf = bytearray()
+        while len(buf) < n:
+            chunk = sock.recv(n - len(buf))
+            if not chunk:
+                raise ConnectionError("Socket closed during read")
+            buf.extend(chunk)
+        return bytes(buf)
+
+    def _dump_cipherstate(self, label: str, cs: CipherState) -> None:
+        """
+        Print the symmetric key (cs._k) and nonce counter (cs._n) for inspection.
+        """
+        key = cs._key
+        nonce = getattr(cs, "_n", None)
+        if isinstance(key, (bytes, bytearray)):
+            key_hex = key.hex()
+        else:
+            key_hex = repr(key)
+        logging.debug(f"[{label}] key={key_hex}")

protocol_prototype/DryBox/UI/waveform_widget.py

@@ -0,0 +1,67 @@
+import random
+import struct
+from PyQt5.QtWidgets import QWidget
+from PyQt5.QtCore import QTimer, QSize, QPointF
+from PyQt5.QtGui import QPainter, QColor, QPen, QLinearGradient, QBrush
+
+class WaveformWidget(QWidget):
+    def __init__(self, parent=None, dynamic=False):
+        super().__init__(parent)
+        self.dynamic = dynamic
+        self.setMinimumSize(200, 60)
+        self.setMaximumHeight(80)
+        self.waveform_data = [random.randint(10, 90) for _ in range(50)]
+        if self.dynamic:
+            self.timer = QTimer(self)
+            self.timer.timeout.connect(self.update_waveform)
+            self.timer.start(100)
+
+    def update_waveform(self):
+        self.waveform_data = self.waveform_data[1:] + [random.randint(10, 90)]
+        self.update()
+
+    def set_data(self, data):
+        # Convert audio data to visual amplitude
+        if isinstance(data, bytes) and len(data) >= 2:
+            # Extract PCM samples (16-bit signed)
+            num_samples = min(len(data) // 2, 20)  # Take up to 20 samples
+            samples = []
+            for i in range(0, num_samples * 2, 2):
+                if i + 1 < len(data):
+                    sample = struct.unpack('h', data[i:i+2])[0]
+                    # Normalize to 0-100 range
+                    amplitude = abs(sample) / 327.68  # 32768/100
+                    samples.append(min(95, max(5, amplitude)))
+            
+            if samples:
+                # Add new samples and maintain fixed size
+                self.waveform_data.extend(samples)
+                # Keep last 50 samples
+                self.waveform_data = self.waveform_data[-50:]
+        else:
+            # Fallback for non-audio data
+            amplitude = sum(byte for byte in data[:20]) % 90 + 10
+            self.waveform_data = self.waveform_data[1:] + [amplitude]
+        
+        self.update()
+
+    def paintEvent(self, event):
+        painter = QPainter(self)
+        painter.setRenderHint(QPainter.Antialiasing)
+        painter.fillRect(self.rect(), QColor("#2D2D2D"))
+        gradient = QLinearGradient(0, 0, 0, self.height())
+        gradient.setColorAt(0.0, QColor("#0078D4"))
+        gradient.setColorAt(1.0, QColor("#50E6A4"))
+        pen = QPen(QBrush(gradient), 2)
+        painter.setPen(pen)
+        bar_width = self.width() / len(self.waveform_data)
+        max_h = self.height() - 10
+        for i, val in enumerate(self.waveform_data):
+            bar_height = (val / 100.0) * max_h
+            x = i * bar_width
+            y = (self.height() - bar_height) / 2
+            painter.drawLine(QPointF(x + bar_width / 2, y), QPointF(x + bar_width / 2, y + bar_height))
+
+    def resizeEvent(self, event):
+        super().resizeEvent(event)
+        self.update()

protocol_prototype/DryBox/install_audio_deps.sh

@@ -0,0 +1,58 @@
+#!/bin/bash
+# Install audio dependencies for DryBox
+
+echo "Installing audio dependencies for DryBox..."
+echo
+
+# Detect OS
+if [ -f /etc/os-release ]; then
+    . /etc/os-release
+    OS=$ID
+    VER=$VERSION_ID
+else
+    echo "Cannot detect OS. Please install manually."
+    exit 1
+fi
+
+case $OS in
+    fedora)
+        echo "Detected Fedora $VER"
+        echo "Installing python3-devel and portaudio-devel..."
+        sudo dnf install -y python3-devel portaudio-devel
+        ;;
+    
+    ubuntu|debian)
+        echo "Detected $OS $VER"
+        echo "Installing python3-dev and portaudio19-dev..."
+        sudo apt-get update
+        sudo apt-get install -y python3-dev portaudio19-dev
+        ;;
+    
+    *)
+        echo "Unsupported OS: $OS"
+        echo "Please install manually:"
+        echo "  - Python development headers"
+        echo "  - PortAudio development libraries"
+        exit 1
+        ;;
+esac
+
+if [ $? -eq 0 ]; then
+    echo
+    echo "System dependencies installed successfully!"
+    echo "Now installing PyAudio..."
+    pip install pyaudio
+    
+    if [ $? -eq 0 ]; then
+        echo
+        echo "✅ Audio dependencies installed successfully!"
+        echo "You can now use real-time audio playback in DryBox."
+    else
+        echo
+        echo "❌ Failed to install PyAudio"
+        echo "Try: pip install --user pyaudio"
+    fi
+else
+    echo
+    echo "❌ Failed to install system dependencies"
+fi

protocol_prototype/DryBox/requirements.txt

@@ -0,0 +1,22 @@
+# Core dependencies for DryBox integrated protocol
+
+# Noise Protocol Framework
+dissononce>=0.34.3
+
+# Cryptography
+cryptography>=41.0.0
+
+# Qt GUI
+PyQt5>=5.15.0
+
+# Numerical computing (for signal processing)
+numpy>=1.24.0
+
+# Audio processing (for real audio I/O)
+pyaudio>=0.2.11
+
+# Wave file handling (included in standard library)
+# wave
+
+# For future integration with real Codec2
+# pycodec2>=1.0.0

protocol_prototype/DryBox/run_ui.sh

@@ -0,0 +1,11 @@
+#!/bin/bash
+# Run DryBox UI with proper Wayland support on Fedora
+
+cd "$(dirname "$0")"
+
+# Use native Wayland if available
+export QT_QPA_PLATFORM=wayland
+
+# Run the UI
+cd UI
+python3 main.py

protocol_prototype/DryBox/simulator/Dockerfile

@@ -0,0 +1,14 @@
+# Use official Python image
+FROM python:3.9-slim
+
+# Set working directory
+WORKDIR /app
+
+# Copy the simulator script
+COPY gsm_simulator.py .
+
+# Expose the port
+EXPOSE 12345
+
+# Run the simulator
+CMD ["python", "gsm_simulator.py"]

protocol_prototype/DryBox/simulator/gsm_simulator.py

@@ -0,0 +1,110 @@
+import socket
+import threading
+import time
+import struct
+
+HOST = "0.0.0.0"
+PORT = 12345
+FRAME_SIZE = 10000  # Increased to avoid fragmenting voice frames
+FRAME_DELAY = 0.02
+
+clients = []
+clients_lock = threading.Lock()
+
+def handle_client(client_sock, client_id):
+    print(f"Starting handle_client for Client {client_id}")
+    recv_buffer = bytearray()
+    
+    try:
+        while True:
+            other_client = None
+            with clients_lock:
+                if len(clients) == 2 and client_id < len(clients):
+                    other_client = clients[1 - client_id]
+            
+            try:
+                chunk = client_sock.recv(4096)
+                if not chunk:
+                    print(f"Client {client_id} disconnected or no data received")
+                    break
+                    
+                # Add to buffer
+                recv_buffer.extend(chunk)
+                
+                # Process complete messages
+                while len(recv_buffer) >= 4:
+                    # Read message length
+                    msg_len = struct.unpack('>I', recv_buffer[:4])[0]
+                    
+                    # Check if we have the complete message
+                    if len(recv_buffer) >= 4 + msg_len:
+                        # Extract complete message (including length prefix)
+                        complete_msg = bytes(recv_buffer[:4+msg_len])
+                        # Remove from buffer
+                        recv_buffer = recv_buffer[4+msg_len:]
+                        
+                        # Forward complete message to other client
+                        if other_client:
+                            try:
+                                other_client.send(complete_msg)
+                                print(f"Forwarded {len(complete_msg)} bytes from Client {client_id} to Client {1 - client_id}")
+                            except Exception as e:
+                                print(f"Error forwarding from Client {client_id}: {e}")
+                        else:
+                            print(f"No other client to forward to from Client {client_id}")
+                    else:
+                        # Wait for more data
+                        break
+                        
+            except socket.error as e:
+                print(f"Socket error with Client {client_id}: {e}")
+                break
+    finally:
+        print(f"Closing connection for Client {client_id}")
+        with clients_lock:
+            if client_id < len(clients) and clients[client_id] == client_sock:
+                clients.pop(client_id)
+                print(f"Removed Client {client_id} from clients list")
+        client_sock.close()
+
+def start_simulator():
+    server = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+    server.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
+    server.bind((HOST, PORT))
+    server.listen(2)
+    print(f"GSM Simulator listening on {HOST}:{PORT}...")
+
+    try:
+        while True:
+            client_sock, addr = server.accept()
+            client_sock.setsockopt(socket.SOL_SOCKET, socket.SO_KEEPALIVE, 1)  # Keep connection alive
+            with clients_lock:
+                if len(clients) < 2:
+                    clients.append(client_sock)
+                    client_id = len(clients) - 1
+                else:
+                    # Replace a closed socket or reject if both slots are active
+                    replaced = False
+                    for i in range(len(clients)):
+                        if clients[i].fileno() == -1:  # Check if socket is closed
+                            clients[i] = client_sock
+                            client_id = i
+                            replaced = True
+                            break
+                    if not replaced:
+                        print(f"Rejecting new client from {addr}: max clients (2) reached")
+                        client_sock.close()
+                        continue
+            print(f"Client {client_id} connected from {addr}")
+            threading.Thread(target=handle_client, args=(client_sock, client_id), daemon=True).start()
+    except KeyboardInterrupt:
+        print("Shutting down simulator...")
+    finally:
+        with clients_lock:
+            for client in clients:
+                client.close()
+            clients.clear()
+        server.close()
+
+if __name__ == "__main__":
+    start_simulator()

protocol_prototype/DryBox/simulator/launch_gsm_simulator.sh

@@ -0,0 +1,68 @@
+#!/bin/bash
+
+# Script to launch the GSM Simulator in Docker
+
+# Variables
+IMAGE_NAME="gsm-simulator"
+CONTAINER_NAME="gsm-sim"
+PORT="12345"
+LOG_FILE="gsm_simulator.log"
+
+# Check if Docker is installed
+if ! command -v docker &> /dev/null; then
+    echo "Error: Docker is not installed. Please install Docker and try again."
+    exit 1
+fi
+
+# Check if gsm_simulator.py exists
+if [ ! -f "gsm_simulator.py" ]; then
+    echo "Error: gsm_simulator.py not found in the current directory."
+    echo "Please ensure gsm_simulator.py is present and try again."
+    exit 1
+fi
+
+# Create Dockerfile if it doesn't exist
+if [ ! -f "Dockerfile" ]; then
+    echo "Creating Dockerfile..."
+    cat <<EOF > Dockerfile
+FROM python:3.9-slim
+WORKDIR /app
+COPY gsm_simulator.py .
+EXPOSE 12345
+CMD ["python", "gsm_simulator.py"]
+EOF
+fi
+
+# Ensure log file is writable
+touch $LOG_FILE
+chmod 666 $LOG_FILE
+
+# Build the Docker image
+echo "Building Docker image: $IMAGE_NAME..."
+docker build -t $IMAGE_NAME .
+
+# Check if the build was successful
+if [ $? -ne 0 ]; then
+    echo "Error: Failed to build Docker image."
+    exit 1
+fi
+
+# Stop and remove any existing container
+if [ "$(docker ps -q -f name=$CONTAINER_NAME)" ]; then
+    echo "Stopping existing container: $CONTAINER_NAME..."
+    docker stop $CONTAINER_NAME
+fi
+if [ "$(docker ps -aq -f name=$CONTAINER_NAME)" ]; then
+    echo "Removing existing container: $CONTAINER_NAME..."
+    docker rm $CONTAINER_NAME
+fi
+
+# Clean up dangling images
+docker image prune -f
+
+# Run the Docker container interactively
+echo "Launching GSM Simulator in Docker container: $CONTAINER_NAME..."
+docker run -it --rm -p $PORT:$PORT --name $CONTAINER_NAME $IMAGE_NAME | tee $LOG_FILE
+
+# Note: Script will block here until container exits
+echo "GSM Simulator stopped. Logs saved to $LOG_FILE."

protocol_prototype/DryBox/voice_codec.py

@@ -0,0 +1,714 @@
+"""
+Voice codec integration for encrypted voice over GSM.
+Implements Codec2 compression with FSK modulation for transmitting
+encrypted voice data over standard GSM voice channels.
+"""
+
+import array
+import math
+import struct
+from typing import Optional, Tuple, List
+from dataclasses import dataclass
+from enum import IntEnum
+
+try:
+    import numpy as np
+    HAS_NUMPY = True
+except ImportError:
+    HAS_NUMPY = False
+
+# ANSI colors
+RED = "\033[91m"
+GREEN = "\033[92m"
+YELLOW = "\033[93m"
+BLUE = "\033[94m"
+RESET = "\033[0m"
+
+
+class Codec2Mode(IntEnum):
+    """Codec2 bitrate modes."""
+    MODE_3200 = 0  # 3200 bps
+    MODE_2400 = 1  # 2400 bps
+    MODE_1600 = 2  # 1600 bps
+    MODE_1400 = 3  # 1400 bps
+    MODE_1300 = 4  # 1300 bps
+    MODE_1200 = 5  # 1200 bps (recommended for robustness)
+    MODE_700C = 6  # 700 bps
+
+
+@dataclass
+class Codec2Frame:
+    """Represents a single Codec2 compressed voice frame."""
+    mode: Codec2Mode
+    bits: bytes
+    timestamp: float
+    frame_number: int
+
+
+class Codec2Wrapper:
+    """
+    Wrapper for Codec2 voice codec.
+    In production, this would use py_codec2 or ctypes bindings to libcodec2.
+    This is a simulation interface for protocol development.
+    """
+
+    # Frame sizes in bits for each mode
+    FRAME_BITS = {
+        Codec2Mode.MODE_3200: 64,
+        Codec2Mode.MODE_2400: 48,
+        Codec2Mode.MODE_1600: 64,
+        Codec2Mode.MODE_1400: 56,
+        Codec2Mode.MODE_1300: 52,
+        Codec2Mode.MODE_1200: 48,
+        Codec2Mode.MODE_700C: 28
+    }
+
+    # Frame duration in ms
+    FRAME_MS = {
+        Codec2Mode.MODE_3200: 20,
+        Codec2Mode.MODE_2400: 20,
+        Codec2Mode.MODE_1600: 40,
+        Codec2Mode.MODE_1400: 40,
+        Codec2Mode.MODE_1300: 40,
+        Codec2Mode.MODE_1200: 40,
+        Codec2Mode.MODE_700C: 40
+    }
+
+    def __init__(self, mode: Codec2Mode = Codec2Mode.MODE_1200):
+        """
+        Initialize Codec2 wrapper.
+
+        Args:
+            mode: Codec2 bitrate mode (default 1200 bps for robustness)
+        """
+        self.mode = mode
+        self.frame_bits = self.FRAME_BITS[mode]
+        self.frame_bytes = (self.frame_bits + 7) // 8
+        self.frame_ms = self.FRAME_MS[mode]
+        self.frame_samples = int(8000 * self.frame_ms / 1000)  # 8kHz sampling
+        self.frame_counter = 0
+
+        # Quiet initialization - no print
+
+    def encode(self, audio_samples) -> Optional[Codec2Frame]:
+        """
+        Encode PCM audio samples to Codec2 frame.
+
+        Args:
+            audio_samples: PCM samples (8kHz, 16-bit signed)
+
+        Returns:
+            Codec2Frame or None if insufficient samples
+        """
+        if len(audio_samples) < self.frame_samples:
+            return None
+
+        # In production: call codec2_encode(state, bits, samples)
+        # Simulation: create pseudo-compressed data
+        compressed = self._simulate_compression(audio_samples[:self.frame_samples])
+
+        frame = Codec2Frame(
+            mode=self.mode,
+            bits=compressed,
+            timestamp=self.frame_counter * self.frame_ms / 1000.0,
+            frame_number=self.frame_counter
+        )
+
+        self.frame_counter += 1
+        return frame
+
+    def decode(self, frame: Codec2Frame):
+        """
+        Decode Codec2 frame to PCM audio samples.
+
+        Args:
+            frame: Codec2 compressed frame
+
+        Returns:
+            PCM samples (8kHz, 16-bit signed)
+        """
+        if frame.mode != self.mode:
+            raise ValueError(f"Frame mode {frame.mode} doesn't match decoder mode {self.mode}")
+
+        # In production: call codec2_decode(state, samples, bits)
+        # Simulation: decompress to audio
+        return self._simulate_decompression(frame.bits)
+
+    def _simulate_compression(self, samples) -> bytes:
+        """Simulate Codec2 compression (for testing)."""
+        # Convert to list if needed
+        if hasattr(samples, 'tolist'):
+            sample_list = samples.tolist()
+        elif hasattr(samples, '__iter__'):
+            sample_list = list(samples)
+        else:
+            sample_list = samples
+
+        # Extract basic features for simulation
+        if HAS_NUMPY and hasattr(samples, '__array__'):
+            # Convert to numpy array if needed
+            np_samples = np.asarray(samples, dtype=np.float32)
+            if len(np_samples) > 0:
+                mean_square = np.mean(np_samples ** 2)
+                energy = np.sqrt(mean_square) if not np.isnan(mean_square) else 0.0
+                zero_crossings = np.sum(np.diff(np.sign(np_samples)) != 0)
+            else:
+                energy = 0.0
+                zero_crossings = 0
+        else:
+            # Manual calculation without numpy
+            if sample_list and len(sample_list) > 0:
+                energy = math.sqrt(sum(s**2 for s in sample_list) / len(sample_list))
+                zero_crossings = sum(1 for i in range(1, len(sample_list))
+                                   if (sample_list[i-1] >= 0) != (sample_list[i] >= 0))
+            else:
+                energy = 0.0
+                zero_crossings = 0
+
+        # Pack into bytes (simplified)
+        # Ensure values are valid
+        energy_int = max(0, min(65535, int(energy)))
+        zc_int = max(0, min(65535, int(zero_crossings)))
+        data = struct.pack('<HH', energy_int, zc_int)
+
+        # Pad to expected frame size
+        data += b'\x00' * (self.frame_bytes - len(data))
+
+        return data[:self.frame_bytes]
+
+    def _simulate_decompression(self, compressed: bytes):
+        """Simulate Codec2 decompression (for testing)."""
+        # Unpack features
+        if len(compressed) >= 4:
+            energy, zero_crossings = struct.unpack('<HH', compressed[:4])
+        else:
+            energy, zero_crossings = 1000, 100
+
+        # Generate synthetic speech-like signal
+        if HAS_NUMPY:
+            t = np.linspace(0, self.frame_ms/1000, self.frame_samples)
+
+            # Base frequency from zero crossings
+            freq = zero_crossings * 10  # Simplified mapping
+
+            # Generate harmonics
+            signal = np.zeros(self.frame_samples)
+            for harmonic in range(1, 4):
+                signal += np.sin(2 * np.pi * freq * harmonic * t) / harmonic
+
+            # Apply energy envelope
+            signal *= energy / 10000.0
+
+            # Convert to 16-bit PCM
+            return (signal * 32767).astype(np.int16)
+        else:
+            # Manual generation without numpy
+            samples = []
+            freq = zero_crossings * 10
+
+            for i in range(self.frame_samples):
+                t = i / 8000.0  # 8kHz sample rate
+                value = 0
+                for harmonic in range(1, 4):
+                    value += math.sin(2 * math.pi * freq * harmonic * t) / harmonic
+
+                value *= energy / 10000.0
+                # Clamp to 16-bit range
+                sample = int(value * 32767)
+                sample = max(-32768, min(32767, sample))
+                samples.append(sample)
+
+            return array.array('h', samples)
+
+
+class FSKModem:
+    """
+    4-FSK modem for transmitting digital data over voice channels.
+    Designed to survive GSM/AMR/EVS vocoders.
+    """
+
+    def __init__(self, sample_rate: int = 8000, baud_rate: int = 600):
+        """
+        Initialize FSK modem.
+
+        Args:
+            sample_rate: Audio sample rate (Hz)
+            baud_rate: Symbol rate (baud)
+        """
+        self.sample_rate = sample_rate
+        self.baud_rate = baud_rate
+        self.samples_per_symbol = int(sample_rate / baud_rate)
+
+        # 4-FSK frequencies (300-3400 Hz band)
+        self.frequencies = [
+            600,   # 00
+            1200,  # 01
+            1800,  # 10
+            2400   # 11
+        ]
+
+        # Preamble for synchronization (800 Hz, 100ms)
+        self.preamble_freq = 800
+        self.preamble_duration = 0.1  # seconds
+
+        # Quiet initialization - no print
+
+    def modulate(self, data: bytes, add_preamble: bool = True):
+        """
+        Modulate binary data to FSK audio signal.
+
+        Args:
+            data: Binary data to modulate
+            add_preamble: Whether to add synchronization preamble
+
+        Returns:
+            Audio signal (normalized float32 array or list)
+        """
+        # Convert bytes to dibits (2-bit symbols)
+        symbols = []
+        for byte in data:
+            symbols.extend([
+                (byte >> 6) & 0x03,
+                (byte >> 4) & 0x03,
+                (byte >> 2) & 0x03,
+                byte & 0x03
+            ])
+
+        # Generate audio signal
+        signal = []
+
+        # Add preamble
+        if add_preamble:
+            preamble_samples = int(self.preamble_duration * self.sample_rate)
+            if HAS_NUMPY:
+                t = np.arange(preamble_samples) / self.sample_rate
+                preamble = np.sin(2 * np.pi * self.preamble_freq * t)
+                signal.extend(preamble)
+            else:
+                for i in range(preamble_samples):
+                    t = i / self.sample_rate
+                    value = math.sin(2 * math.pi * self.preamble_freq * t)
+                    signal.append(value)
+
+        # Modulate symbols
+        for symbol in symbols:
+            freq = self.frequencies[symbol]
+            if HAS_NUMPY:
+                t = np.arange(self.samples_per_symbol) / self.sample_rate
+                tone = np.sin(2 * np.pi * freq * t)
+                signal.extend(tone)
+            else:
+                for i in range(self.samples_per_symbol):
+                    t = i / self.sample_rate
+                    value = math.sin(2 * math.pi * freq * t)
+                    signal.append(value)
+
+        # Apply smoothing to reduce clicks
+        if HAS_NUMPY:
+            audio = np.array(signal, dtype=np.float32)
+        else:
+            audio = array.array('f', signal)
+        audio = self._apply_envelope(audio)
+
+        return audio
+
+    def demodulate(self, audio) -> Tuple[bytes, float]:
+        """
+        Demodulate FSK audio signal to binary data.
+
+        Args:
+            audio: Audio signal
+
+        Returns:
+            Tuple of (demodulated data, confidence score)
+        """
+        # Find preamble
+        preamble_start = self._find_preamble(audio)
+        if preamble_start < 0:
+            return b'', 0.0
+
+        # Skip preamble
+        data_start = preamble_start + int(self.preamble_duration * self.sample_rate)
+
+        # Demodulate symbols
+        symbols = []
+        confidence_scores = []
+
+        pos = data_start
+        while pos + self.samples_per_symbol <= len(audio):
+            symbol_audio = audio[pos:pos + self.samples_per_symbol]
+            symbol, confidence = self._demodulate_symbol(symbol_audio)
+            symbols.append(symbol)
+            confidence_scores.append(confidence)
+            pos += self.samples_per_symbol
+
+        # Convert symbols to bytes
+        data = bytearray()
+        for i in range(0, len(symbols), 4):
+            if i + 3 < len(symbols):
+                byte = (symbols[i] << 6) | (symbols[i+1] << 4) | (symbols[i+2] << 2) | symbols[i+3]
+                data.append(byte)
+
+        if HAS_NUMPY and confidence_scores:
+            avg_confidence = np.mean(confidence_scores)
+        else:
+            avg_confidence = sum(confidence_scores) / len(confidence_scores) if confidence_scores else 0.0
+        return bytes(data), avg_confidence
+
+    def _find_preamble(self, audio) -> int:
+        """Find preamble in audio signal."""
+        # Simple energy-based detection
+        window_size = int(0.01 * self.sample_rate)  # 10ms window
+
+        if HAS_NUMPY:
+            for i in range(0, len(audio) - window_size, window_size // 2):
+                window = audio[i:i + window_size]
+
+                # Check for preamble frequency
+                fft = np.fft.fft(window)
+                freqs = np.fft.fftfreq(len(window), 1/self.sample_rate)
+
+                # Find peak near preamble frequency
+                idx = np.argmax(np.abs(fft[:len(fft)//2]))
+                peak_freq = abs(freqs[idx])
+
+                if abs(peak_freq - self.preamble_freq) < 50:  # 50 Hz tolerance
+                    return i
+        else:
+            # Simple zero-crossing based detection without FFT
+            for i in range(0, len(audio) - window_size, window_size // 2):
+                window = list(audio[i:i + window_size])
+
+                # Count zero crossings
+                zero_crossings = 0
+                for j in range(1, len(window)):
+                    if (window[j-1] >= 0) != (window[j] >= 0):
+                        zero_crossings += 1
+
+                # Estimate frequency from zero crossings
+                estimated_freq = (zero_crossings * self.sample_rate) / (2 * len(window))
+
+                if abs(estimated_freq - self.preamble_freq) < 100:  # 100 Hz tolerance
+                    return i
+
+        return -1
+
+    def _demodulate_symbol(self, audio) -> Tuple[int, float]:
+        """Demodulate a single FSK symbol."""
+        if HAS_NUMPY:
+            # FFT-based demodulation
+            fft = np.fft.fft(audio)
+            freqs = np.fft.fftfreq(len(audio), 1/self.sample_rate)
+            magnitude = np.abs(fft[:len(fft)//2])
+
+            # Find energy at each FSK frequency
+            energies = []
+            for freq in self.frequencies:
+                idx = np.argmin(np.abs(freqs[:len(freqs)//2] - freq))
+                energy = magnitude[idx]
+                energies.append(energy)
+
+            # Select symbol with highest energy
+            symbol = np.argmax(energies)
+        else:
+            # Goertzel algorithm for specific frequency detection
+            audio_list = list(audio) if hasattr(audio, '__iter__') else audio
+            energies = []
+
+            for freq in self.frequencies:
+                # Goertzel algorithm
+                omega = 2 * math.pi * freq / self.sample_rate
+                coeff = 2 * math.cos(omega)
+
+                s_prev = 0
+                s_prev2 = 0
+
+                for sample in audio_list:
+                    s = sample + coeff * s_prev - s_prev2
+                    s_prev2 = s_prev
+                    s_prev = s
+
+                # Calculate magnitude
+                power = s_prev2 * s_prev2 + s_prev * s_prev - coeff * s_prev * s_prev2
+                energies.append(math.sqrt(abs(power)))
+
+            # Select symbol with highest energy
+            symbol = energies.index(max(energies))
+
+        # Confidence is ratio of strongest to second strongest
+        sorted_energies = sorted(energies, reverse=True)
+        confidence = sorted_energies[0] / (sorted_energies[1] + 1e-6)
+
+        return symbol, min(confidence, 10.0) / 10.0
+
+    def _apply_envelope(self, audio):
+        """Apply smoothing envelope to reduce clicks."""
+        # Simple raised cosine envelope
+        ramp_samples = int(0.002 * self.sample_rate)  # 2ms ramps
+
+        if len(audio) > 2 * ramp_samples:
+            if HAS_NUMPY:
+                # Fade in
+                t = np.linspace(0, np.pi/2, ramp_samples)
+                audio[:ramp_samples] *= np.sin(t) ** 2
+
+                # Fade out
+                audio[-ramp_samples:] *= np.sin(t[::-1]) ** 2
+            else:
+                # Manual fade in
+                for i in range(ramp_samples):
+                    t = (i / ramp_samples) * (math.pi / 2)
+                    factor = math.sin(t) ** 2
+                    audio[i] *= factor
+
+                # Manual fade out
+                for i in range(ramp_samples):
+                    t = ((ramp_samples - 1 - i) / ramp_samples) * (math.pi / 2)
+                    factor = math.sin(t) ** 2
+                    audio[-(i+1)] *= factor
+
+        return audio
+
+
+class VoiceProtocol:
+    """
+    Integrates voice codec and modem with the Icing protocol
+    for encrypted voice transmission over GSM.
+    """
+
+    def __init__(self, protocol_instance):
+        """
+        Initialize voice protocol handler.
+
+        Args:
+            protocol_instance: IcingProtocol instance
+        """
+        self.protocol = protocol_instance
+        self.codec = Codec2Wrapper(Codec2Mode.MODE_1200)
+        self.modem = FSKModem(sample_rate=8000, baud_rate=600)
+
+        # Voice crypto state
+        self.voice_iv_counter = 0
+        self.voice_sequence = 0
+
+        # Buffers
+        if HAS_NUMPY:
+            self.audio_buffer = np.array([], dtype=np.int16)
+        else:
+            self.audio_buffer = array.array('h')  # 16-bit signed integers
+        self.frame_buffer = []
+
+        print(f"{GREEN}[VOICE]{RESET} Voice protocol initialized")
+
+    def process_voice_input(self, audio_samples):
+        """
+        Process voice input: compress, encrypt, and modulate.
+
+        Args:
+            audio_samples: PCM audio samples (8kHz, 16-bit)
+
+        Returns:
+            Modulated audio signal ready for transmission (numpy array or array.array)
+        """
+        # Add to buffer
+        if HAS_NUMPY:
+            self.audio_buffer = np.concatenate([self.audio_buffer, audio_samples])
+        else:
+            self.audio_buffer.extend(audio_samples)
+
+        # Process complete frames
+        modulated_audio = []
+
+        while len(self.audio_buffer) >= self.codec.frame_samples:
+            # Extract frame
+            if HAS_NUMPY:
+                frame_audio = self.audio_buffer[:self.codec.frame_samples]
+                self.audio_buffer = self.audio_buffer[self.codec.frame_samples:]
+            else:
+                frame_audio = array.array('h', self.audio_buffer[:self.codec.frame_samples])
+                del self.audio_buffer[:self.codec.frame_samples]
+
+            # Compress with Codec2
+            compressed_frame = self.codec.encode(frame_audio)
+            if not compressed_frame:
+                continue
+
+            # Encrypt frame
+            encrypted = self._encrypt_voice_frame(compressed_frame)
+
+            # Add FEC
+            protected = self._add_fec(encrypted)
+
+            # Modulate to audio
+            audio_signal = self.modem.modulate(protected, add_preamble=True)
+            modulated_audio.append(audio_signal)
+
+        if modulated_audio:
+            if HAS_NUMPY:
+                return np.concatenate(modulated_audio)
+            else:
+                # Concatenate array.array objects
+                result = array.array('f')
+                for audio in modulated_audio:
+                    result.extend(audio)
+                return result
+        return None
+
+    def process_voice_output(self, modulated_audio):
+        """
+        Process received audio: demodulate, decrypt, and decompress.
+
+        Args:
+            modulated_audio: Received FSK-modulated audio
+
+        Returns:
+            Decoded PCM audio samples (numpy array or array.array)
+        """
+        # Demodulate
+        data, confidence = self.modem.demodulate(modulated_audio)
+
+        if confidence < 0.5:
+            print(f"{YELLOW}[VOICE]{RESET} Low demodulation confidence: {confidence:.2f}")
+            return None
+
+        # Remove FEC
+        frame_data = self._remove_fec(data)
+        if not frame_data:
+            return None
+
+        # Decrypt
+        compressed_frame = self._decrypt_voice_frame(frame_data)
+        if not compressed_frame:
+            return None
+
+        # Decompress
+        audio_samples = self.codec.decode(compressed_frame)
+
+        return audio_samples
+
+    def _encrypt_voice_frame(self, frame: Codec2Frame) -> bytes:
+        """Encrypt a voice frame using ChaCha20-CTR."""
+        if not self.protocol.hkdf_key:
+            raise ValueError("No encryption key available")
+
+        # Prepare frame data
+        frame_data = struct.pack('<BIH',
+            frame.mode,
+            frame.frame_number,
+            len(frame.bits)
+        ) + frame.bits
+
+        # Generate IV for this frame (ChaCha20 needs 16 bytes)
+        iv = struct.pack('<Q', self.voice_iv_counter) + b'\x00' * 8  # 8 + 8 = 16 bytes
+        self.voice_iv_counter += 1
+
+        # Encrypt using ChaCha20
+        from encryption import chacha20_encrypt
+        key = bytes.fromhex(self.protocol.hkdf_key)
+        encrypted = chacha20_encrypt(frame_data, key, iv)
+
+        # Add sequence number and IV hint
+        return struct.pack('<HQ', self.voice_sequence, self.voice_iv_counter) + encrypted
+
+    def _decrypt_voice_frame(self, data: bytes) -> Optional[Codec2Frame]:
+        """Decrypt a voice frame."""
+        if len(data) < 10:
+            return None
+
+        # Extract sequence and IV hint
+        sequence, iv_hint = struct.unpack('<HQ', data[:10])
+        encrypted = data[10:]
+
+        # Generate IV (16 bytes for ChaCha20)
+        iv = struct.pack('<Q', iv_hint) + b'\x00' * 8
+
+        # Decrypt
+        from encryption import chacha20_decrypt
+        key = bytes.fromhex(self.protocol.hkdf_key)
+
+        try:
+            decrypted = chacha20_decrypt(encrypted, key, iv)
+
+            # Parse frame
+            mode, frame_num, bits_len = struct.unpack('<BIH', decrypted[:7])
+            bits = decrypted[7:7+bits_len]
+
+            return Codec2Frame(
+                mode=Codec2Mode(mode),
+                bits=bits,
+                timestamp=0,  # Will be set by caller
+                frame_number=frame_num
+            )
+        except Exception as e:
+            print(f"{RED}[VOICE]{RESET} Decryption failed: {e}")
+            return None
+
+    def _add_fec(self, data: bytes) -> bytes:
+        """Add forward error correction."""
+        # Simple repetition code (3x) for testing
+        # In production: use convolutional code or LDPC
+        fec_data = bytearray()
+
+        for byte in data:
+            # Repeat each byte 3 times
+            fec_data.extend([byte, byte, byte])
+
+        return bytes(fec_data)
+
+    def _remove_fec(self, data: bytes) -> Optional[bytes]:
+        """Remove FEC and correct errors."""
+        if len(data) % 3 != 0:
+            return None
+
+        corrected = bytearray()
+
+        for i in range(0, len(data), 3):
+            # Majority voting
+            votes = [data[i], data[i+1], data[i+2]]
+            byte_value = max(set(votes), key=votes.count)
+            corrected.append(byte_value)
+
+        return bytes(corrected)
+
+
+# Example usage
+if __name__ == "__main__":
+    # Test Codec2 wrapper
+    print(f"\n{BLUE}=== Testing Codec2 Wrapper ==={RESET}")
+    codec = Codec2Wrapper(Codec2Mode.MODE_1200)
+
+    # Generate test audio
+    if HAS_NUMPY:
+        t = np.linspace(0, 0.04, 320)  # 40ms at 8kHz
+        test_audio = (np.sin(2 * np.pi * 440 * t) * 16384).astype(np.int16)
+    else:
+        test_audio = array.array('h')
+        for i in range(320):
+            t = i * 0.04 / 320
+            value = int(math.sin(2 * math.pi * 440 * t) * 16384)
+            test_audio.append(value)
+
+    # Encode
+    frame = codec.encode(test_audio)
+    print(f"Encoded frame: {len(frame.bits)} bytes")
+
+    # Decode
+    decoded = codec.decode(frame)
+    print(f"Decoded audio: {len(decoded)} samples")
+
+    # Test FSK modem
+    print(f"\n{BLUE}=== Testing FSK Modem ==={RESET}")
+    modem = FSKModem()
+
+    # Test data
+    test_data = b"Hello, secure voice!"
+
+    # Modulate
+    modulated = modem.modulate(test_data)
+    print(f"Modulated: {len(modulated)} samples ({len(modulated)/8000:.2f}s)")
+
+    # Demodulate
+    demodulated, confidence = modem.demodulate(modulated)
+    print(f"Demodulated: {demodulated}")
+    print(f"Confidence: {confidence:.2%}")
+    print(f"Match: {demodulated == test_data}")

protocol_prototype/IcingProtocol.drawio

@@ -0,0 +1,805 @@
+<mxfile host="Electron" agent="Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/26.0.16 Chrome/132.0.6834.196 Electron/34.2.0 Safari/537.36" version="26.0.16" pages="4">
+  <diagram id="C5RBs43oDa-KdzZeNtuy" name="Logique">
+    <mxGraphModel dx="735" dy="407" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="827" pageHeight="1169" math="0" shadow="0">
+      <root>
+        <mxCell id="WIyWlLk6GJQsqaUBKTNV-0" />
+        <mxCell id="WIyWlLk6GJQsqaUBKTNV-1" parent="WIyWlLk6GJQsqaUBKTNV-0" />
+        <mxCell id="WIyWlLk6GJQsqaUBKTNV-2" value="" style="rounded=0;html=1;jettySize=auto;orthogonalLoop=1;fontSize=11;endArrow=block;endFill=0;endSize=8;strokeWidth=1;shadow=0;labelBackgroundColor=none;edgeStyle=orthogonalEdgeStyle;" parent="WIyWlLk6GJQsqaUBKTNV-1" source="WIyWlLk6GJQsqaUBKTNV-3" target="WIyWlLk6GJQsqaUBKTNV-6" edge="1">
+          <mxGeometry relative="1" as="geometry" />
+        </mxCell>
+        <mxCell id="WIyWlLk6GJQsqaUBKTNV-3" value="Alice appelle Bob" style="rounded=1;whiteSpace=wrap;html=1;fontSize=12;glass=0;strokeWidth=3;shadow=0;strokeColor=light-dark(#000000,#370FFF);" parent="WIyWlLk6GJQsqaUBKTNV-1" vertex="1">
+          <mxGeometry x="300" y="90" width="120" height="40" as="geometry" />
+        </mxCell>
+        <mxCell id="WIyWlLk6GJQsqaUBKTNV-4" value="Yes" style="rounded=0;html=1;jettySize=auto;orthogonalLoop=1;fontSize=11;endArrow=block;endFill=0;endSize=8;strokeWidth=1;shadow=0;labelBackgroundColor=none;edgeStyle=orthogonalEdgeStyle;" parent="WIyWlLk6GJQsqaUBKTNV-1" source="FXGPDhTRSO2FZSW48CnP-0" target="WIyWlLk6GJQsqaUBKTNV-10" edge="1">
+          <mxGeometry y="20" relative="1" as="geometry">
+            <mxPoint as="offset" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="WIyWlLk6GJQsqaUBKTNV-5" value="No" style="edgeStyle=orthogonalEdgeStyle;rounded=0;html=1;jettySize=auto;orthogonalLoop=1;fontSize=11;endArrow=block;endFill=0;endSize=8;strokeWidth=1;shadow=0;labelBackgroundColor=none;" parent="WIyWlLk6GJQsqaUBKTNV-1" source="WIyWlLk6GJQsqaUBKTNV-6" target="WIyWlLk6GJQsqaUBKTNV-7" edge="1">
+          <mxGeometry y="10" relative="1" as="geometry">
+            <mxPoint as="offset" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="WIyWlLk6GJQsqaUBKTNV-6" value="Bob répond ?" style="rhombus;whiteSpace=wrap;html=1;shadow=0;fontFamily=Helvetica;fontSize=12;align=center;strokeWidth=1;spacing=6;spacingTop=-4;" parent="WIyWlLk6GJQsqaUBKTNV-1" vertex="1">
+          <mxGeometry x="310" y="180" width="100" height="80" as="geometry" />
+        </mxCell>
+        <mxCell id="WIyWlLk6GJQsqaUBKTNV-7" value="Rien ne se passe" style="rounded=1;whiteSpace=wrap;html=1;fontSize=12;glass=0;strokeWidth=1;shadow=0;" parent="WIyWlLk6GJQsqaUBKTNV-1" vertex="1">
+          <mxGeometry x="460" y="200" width="120" height="40" as="geometry" />
+        </mxCell>
+        <mxCell id="WIyWlLk6GJQsqaUBKTNV-8" value="Négativement" style="rounded=0;html=1;jettySize=auto;orthogonalLoop=1;fontSize=11;endArrow=block;endFill=0;endSize=8;strokeWidth=1;shadow=0;labelBackgroundColor=none;edgeStyle=orthogonalEdgeStyle;" parent="WIyWlLk6GJQsqaUBKTNV-1" source="WIyWlLk6GJQsqaUBKTNV-10" target="WIyWlLk6GJQsqaUBKTNV-11" edge="1">
+          <mxGeometry y="40" relative="1" as="geometry">
+            <mxPoint as="offset" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="WIyWlLk6GJQsqaUBKTNV-9" value="Positivement" style="edgeStyle=orthogonalEdgeStyle;rounded=0;html=1;jettySize=auto;orthogonalLoop=1;fontSize=11;endArrow=block;endFill=0;endSize=8;strokeWidth=1;shadow=0;labelBackgroundColor=none;" parent="WIyWlLk6GJQsqaUBKTNV-1" source="WIyWlLk6GJQsqaUBKTNV-10" target="WIyWlLk6GJQsqaUBKTNV-12" edge="1">
+          <mxGeometry y="10" relative="1" as="geometry">
+            <mxPoint as="offset" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="WIyWlLk6GJQsqaUBKTNV-10" value="Bob ping..." style="whiteSpace=wrap;html=1;shadow=0;fontFamily=Helvetica;fontSize=12;align=center;strokeWidth=1;spacing=6;spacingTop=-4;shape=hexagon;perimeter=hexagonPerimeter2;fixedSize=1;" parent="WIyWlLk6GJQsqaUBKTNV-1" vertex="1">
+          <mxGeometry x="310" y="390" width="100" height="80" as="geometry" />
+        </mxCell>
+        <mxCell id="WIyWlLk6GJQsqaUBKTNV-11" value="Protocole échoué&lt;div&gt;-&lt;/div&gt;&lt;div&gt;Passage en clair&lt;/div&gt;" style="rounded=1;whiteSpace=wrap;html=1;fontSize=12;glass=0;strokeWidth=3;shadow=0;strokeColor=light-dark(#000000,#FF1414);" parent="WIyWlLk6GJQsqaUBKTNV-1" vertex="1">
+          <mxGeometry x="300" y="520" width="120" height="50" as="geometry" />
+        </mxCell>
+        <mxCell id="FXGPDhTRSO2FZSW48CnP-7" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;endArrow=block;endFill=0;" parent="WIyWlLk6GJQsqaUBKTNV-1" source="WIyWlLk6GJQsqaUBKTNV-12" target="FXGPDhTRSO2FZSW48CnP-8" edge="1">
+          <mxGeometry relative="1" as="geometry">
+            <mxPoint x="599.9999999999998" y="500" as="targetPoint" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="WIyWlLk6GJQsqaUBKTNV-12" value="Alice envoi son&lt;span style=&quot;background-color: transparent; color: light-dark(rgb(0, 0, 0), rgb(255, 255, 255));&quot;&gt;&amp;nbsp;handshake a Bob&lt;/span&gt;" style="rounded=1;whiteSpace=wrap;html=1;fontSize=12;glass=0;strokeWidth=1;shadow=0;" parent="WIyWlLk6GJQsqaUBKTNV-1" vertex="1">
+          <mxGeometry x="540" y="410" width="120" height="40" as="geometry" />
+        </mxCell>
+        <mxCell id="FXGPDhTRSO2FZSW48CnP-1" value="" style="rounded=0;html=1;jettySize=auto;orthogonalLoop=1;fontSize=11;endArrow=block;endFill=0;endSize=8;strokeWidth=1;shadow=0;labelBackgroundColor=none;edgeStyle=orthogonalEdgeStyle;" parent="WIyWlLk6GJQsqaUBKTNV-1" source="WIyWlLk6GJQsqaUBKTNV-6" target="FXGPDhTRSO2FZSW48CnP-0" edge="1">
+          <mxGeometry y="20" relative="1" as="geometry">
+            <mxPoint as="offset" />
+            <mxPoint x="360" y="260" as="sourcePoint" />
+            <mxPoint x="360" y="390" as="targetPoint" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="FXGPDhTRSO2FZSW48CnP-0" value="Le dialer d&#39;Alice envoi un PING a Bob" style="rounded=1;whiteSpace=wrap;html=1;fontSize=12;glass=0;strokeWidth=1;shadow=0;" parent="WIyWlLk6GJQsqaUBKTNV-1" vertex="1">
+          <mxGeometry x="300" y="300" width="120" height="40" as="geometry" />
+        </mxCell>
+        <mxCell id="FXGPDhTRSO2FZSW48CnP-2" value="" style="endArrow=block;html=1;rounded=0;exitX=0;exitY=0.5;exitDx=0;exitDy=0;endFill=0;entryX=1;entryY=0.5;entryDx=0;entryDy=0;edgeStyle=orthogonalEdgeStyle;" parent="WIyWlLk6GJQsqaUBKTNV-1" source="WIyWlLk6GJQsqaUBKTNV-10" target="FXGPDhTRSO2FZSW48CnP-4" edge="1">
+          <mxGeometry width="50" height="50" relative="1" as="geometry">
+            <mxPoint x="480" y="450" as="sourcePoint" />
+            <mxPoint x="190" y="430" as="targetPoint" />
+            <Array as="points">
+              <mxPoint x="280" y="430" />
+              <mxPoint x="280" y="460" />
+            </Array>
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="FXGPDhTRSO2FZSW48CnP-3" value="Ne ping pas" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" parent="FXGPDhTRSO2FZSW48CnP-2" vertex="1" connectable="0">
+          <mxGeometry x="-0.2695" relative="1" as="geometry">
+            <mxPoint x="-16" y="-10" as="offset" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="FXGPDhTRSO2FZSW48CnP-5" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" parent="WIyWlLk6GJQsqaUBKTNV-1" source="FXGPDhTRSO2FZSW48CnP-4" target="FXGPDhTRSO2FZSW48CnP-0" edge="1">
+          <mxGeometry relative="1" as="geometry">
+            <Array as="points">
+              <mxPoint x="130" y="320" />
+            </Array>
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="FXGPDhTRSO2FZSW48CnP-6" value="Reping" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" parent="FXGPDhTRSO2FZSW48CnP-5" vertex="1" connectable="0">
+          <mxGeometry x="0.0817" relative="1" as="geometry">
+            <mxPoint x="23" y="-10" as="offset" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="FXGPDhTRSO2FZSW48CnP-4" value="Attendre 1s ? 0.5s ?" style="rounded=1;whiteSpace=wrap;html=1;" parent="WIyWlLk6GJQsqaUBKTNV-1" vertex="1">
+          <mxGeometry x="70" y="440" width="120" height="40" as="geometry" />
+        </mxCell>
+        <mxCell id="FXGPDhTRSO2FZSW48CnP-12" value="" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0;exitY=0.5;exitDx=0;exitDy=0;entryX=1;entryY=0.5;entryDx=0;entryDy=0;endArrow=block;endFill=0;" parent="WIyWlLk6GJQsqaUBKTNV-1" source="FXGPDhTRSO2FZSW48CnP-8" target="FXGPDhTRSO2FZSW48CnP-11" edge="1">
+          <mxGeometry relative="1" as="geometry">
+            <mxPoint x="530.0380952380951" y="585.0038095238094" as="sourcePoint" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="FXGPDhTRSO2FZSW48CnP-13" value="Non" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" parent="FXGPDhTRSO2FZSW48CnP-12" vertex="1" connectable="0">
+          <mxGeometry x="-0.4964" y="-1" relative="1" as="geometry">
+            <mxPoint as="offset" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="FXGPDhTRSO2FZSW48CnP-43" value="" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;endArrow=block;endFill=0;strokeColor=light-dark(#000000,#FF0000);" parent="WIyWlLk6GJQsqaUBKTNV-1" source="FXGPDhTRSO2FZSW48CnP-8" target="FXGPDhTRSO2FZSW48CnP-27" edge="1">
+          <mxGeometry relative="1" as="geometry">
+            <mxPoint x="600" y="800" as="targetPoint" />
+            <Array as="points">
+              <mxPoint x="600" y="660" />
+              <mxPoint x="570" y="660" />
+              <mxPoint x="570" y="700" />
+              <mxPoint x="210" y="700" />
+            </Array>
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="FXGPDhTRSO2FZSW48CnP-44" value="Oui" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" parent="FXGPDhTRSO2FZSW48CnP-43" vertex="1" connectable="0">
+          <mxGeometry x="-0.8049" y="1" relative="1" as="geometry">
+            <mxPoint x="8" y="-25" as="offset" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="FXGPDhTRSO2FZSW48CnP-8" value="Bob reconnait la clé publique d&#39;Alice ?" style="rhombus;whiteSpace=wrap;html=1;fontSize=10;" parent="WIyWlLk6GJQsqaUBKTNV-1" vertex="1">
+          <mxGeometry x="540" y="545" width="120" height="75" as="geometry" />
+        </mxCell>
+        <mxCell id="FXGPDhTRSO2FZSW48CnP-16" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;endArrow=block;endFill=0;entryX=0.5;entryY=1;entryDx=0;entryDy=0;" parent="WIyWlLk6GJQsqaUBKTNV-1" source="FXGPDhTRSO2FZSW48CnP-11" target="WIyWlLk6GJQsqaUBKTNV-11" edge="1">
+          <mxGeometry relative="1" as="geometry">
+            <mxPoint x="360" y="600" as="targetPoint" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="FXGPDhTRSO2FZSW48CnP-17" value="Non" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" parent="FXGPDhTRSO2FZSW48CnP-16" vertex="1" connectable="0">
+          <mxGeometry x="-0.1233" y="-2" relative="1" as="geometry">
+            <mxPoint as="offset" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="FXGPDhTRSO2FZSW48CnP-20" value="" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;endArrow=block;endFill=0;" parent="WIyWlLk6GJQsqaUBKTNV-1" source="FXGPDhTRSO2FZSW48CnP-11" target="FXGPDhTRSO2FZSW48CnP-19" edge="1">
+          <mxGeometry relative="1" as="geometry" />
+        </mxCell>
+        <mxCell id="FXGPDhTRSO2FZSW48CnP-21" value="Oui" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" parent="FXGPDhTRSO2FZSW48CnP-20" vertex="1" connectable="0">
+          <mxGeometry x="-0.275" y="1" relative="1" as="geometry">
+            <mxPoint as="offset" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="FXGPDhTRSO2FZSW48CnP-11" value="Bob accepte la clé d&#39;Alice?" style="rhombus;whiteSpace=wrap;html=1;fontSize=10;" parent="WIyWlLk6GJQsqaUBKTNV-1" vertex="1">
+          <mxGeometry x="354" y="620" width="120" height="75" as="geometry" />
+        </mxCell>
+        <mxCell id="FXGPDhTRSO2FZSW48CnP-23" value="" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;endArrow=block;endFill=0;" parent="WIyWlLk6GJQsqaUBKTNV-1" source="FXGPDhTRSO2FZSW48CnP-19" target="FXGPDhTRSO2FZSW48CnP-22" edge="1">
+          <mxGeometry relative="1" as="geometry" />
+        </mxCell>
+        <mxCell id="FXGPDhTRSO2FZSW48CnP-19" value="Bob envoi sa clé publique en handshake" style="whiteSpace=wrap;html=1;fontSize=10;rounded=1;" parent="WIyWlLk6GJQsqaUBKTNV-1" vertex="1">
+          <mxGeometry x="160" y="636.25" width="120" height="42.5" as="geometry" />
+        </mxCell>
+        <mxCell id="FXGPDhTRSO2FZSW48CnP-24" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;endArrow=block;endFill=0;" parent="WIyWlLk6GJQsqaUBKTNV-1" source="FXGPDhTRSO2FZSW48CnP-22" target="WIyWlLk6GJQsqaUBKTNV-11" edge="1">
+          <mxGeometry relative="1" as="geometry">
+            <Array as="points">
+              <mxPoint x="70" y="545" />
+            </Array>
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="FXGPDhTRSO2FZSW48CnP-25" value="Non" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" parent="FXGPDhTRSO2FZSW48CnP-24" vertex="1" connectable="0">
+          <mxGeometry x="-0.7543" y="3" relative="1" as="geometry">
+            <mxPoint as="offset" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="FXGPDhTRSO2FZSW48CnP-28" value="" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;endArrow=block;endFill=0;" parent="WIyWlLk6GJQsqaUBKTNV-1" source="FXGPDhTRSO2FZSW48CnP-22" target="FXGPDhTRSO2FZSW48CnP-27" edge="1">
+          <mxGeometry relative="1" as="geometry">
+            <Array as="points">
+              <mxPoint x="70" y="750" />
+            </Array>
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="FXGPDhTRSO2FZSW48CnP-22" value="Alice accepte la clé publique de Bob&lt;span style=&quot;background-color: transparent; color: light-dark(rgb(0, 0, 0), rgb(255, 255, 255));&quot;&gt;&amp;nbsp;?&lt;/span&gt;" style="rhombus;whiteSpace=wrap;html=1;fontSize=10;rounded=0;" parent="WIyWlLk6GJQsqaUBKTNV-1" vertex="1">
+          <mxGeometry x="30" y="617.5" width="80" height="80" as="geometry" />
+        </mxCell>
+        <mxCell id="FXGPDhTRSO2FZSW48CnP-47" value="" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" parent="WIyWlLk6GJQsqaUBKTNV-1" source="FXGPDhTRSO2FZSW48CnP-26" target="FXGPDhTRSO2FZSW48CnP-46" edge="1">
+          <mxGeometry relative="1" as="geometry" />
+        </mxCell>
+        <mxCell id="FXGPDhTRSO2FZSW48CnP-26" value="Alice et Bob sont d&#39;accord sur la clé symmétrique a utiliser" style="rounded=0;whiteSpace=wrap;html=1;" parent="WIyWlLk6GJQsqaUBKTNV-1" vertex="1">
+          <mxGeometry x="340" y="820" width="120" height="60" as="geometry" />
+        </mxCell>
+        <mxCell id="FXGPDhTRSO2FZSW48CnP-31" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;endArrow=block;endFill=0;" parent="WIyWlLk6GJQsqaUBKTNV-1" source="FXGPDhTRSO2FZSW48CnP-27" target="FXGPDhTRSO2FZSW48CnP-30" edge="1">
+          <mxGeometry relative="1" as="geometry" />
+        </mxCell>
+        <mxCell id="FXGPDhTRSO2FZSW48CnP-45" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;strokeColor=light-dark(#000000,#FF1616);endArrow=block;endFill=0;" parent="WIyWlLk6GJQsqaUBKTNV-1" source="FXGPDhTRSO2FZSW48CnP-27" target="FXGPDhTRSO2FZSW48CnP-26" edge="1">
+          <mxGeometry relative="1" as="geometry">
+            <Array as="points">
+              <mxPoint x="210" y="850" />
+            </Array>
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="FXGPDhTRSO2FZSW48CnP-27" value="Alice et Bob calculent le secret partagé de leur côté" style="whiteSpace=wrap;html=1;fontSize=10;rounded=1;" parent="WIyWlLk6GJQsqaUBKTNV-1" vertex="1">
+          <mxGeometry x="150" y="720" width="120" height="50" as="geometry" />
+        </mxCell>
+        <mxCell id="FXGPDhTRSO2FZSW48CnP-33" value="" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.5;entryY=1;entryDx=0;entryDy=0;jumpStyle=sharp;" parent="WIyWlLk6GJQsqaUBKTNV-1" source="FXGPDhTRSO2FZSW48CnP-29" target="FXGPDhTRSO2FZSW48CnP-34" edge="1">
+          <mxGeometry relative="1" as="geometry">
+            <mxPoint x="640" y="680" as="targetPoint" />
+            <Array as="points">
+              <mxPoint x="700" y="745" />
+            </Array>
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="FXGPDhTRSO2FZSW48CnP-36" value="Non" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" parent="FXGPDhTRSO2FZSW48CnP-33" vertex="1" connectable="0">
+          <mxGeometry x="-0.1536" y="1" relative="1" as="geometry">
+            <mxPoint as="offset" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="FXGPDhTRSO2FZSW48CnP-41" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=1;entryY=0.5;entryDx=0;entryDy=0;" parent="WIyWlLk6GJQsqaUBKTNV-1" source="FXGPDhTRSO2FZSW48CnP-29" target="FXGPDhTRSO2FZSW48CnP-26" edge="1">
+          <mxGeometry relative="1" as="geometry">
+            <Array as="points">
+              <mxPoint x="525" y="798" />
+              <mxPoint x="510" y="798" />
+              <mxPoint x="510" y="850" />
+            </Array>
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="FXGPDhTRSO2FZSW48CnP-42" value="Oui" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" parent="FXGPDhTRSO2FZSW48CnP-41" vertex="1" connectable="0">
+          <mxGeometry x="-0.7774" y="1" relative="1" as="geometry">
+            <mxPoint as="offset" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="FXGPDhTRSO2FZSW48CnP-29" value="Ils sont d&#39;accord ?" style="rhombus;whiteSpace=wrap;html=1;" parent="WIyWlLk6GJQsqaUBKTNV-1" vertex="1">
+          <mxGeometry x="460" y="715" width="130" height="60" as="geometry" />
+        </mxCell>
+        <mxCell id="FXGPDhTRSO2FZSW48CnP-32" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" parent="WIyWlLk6GJQsqaUBKTNV-1" source="FXGPDhTRSO2FZSW48CnP-30" target="FXGPDhTRSO2FZSW48CnP-29" edge="1">
+          <mxGeometry relative="1" as="geometry" />
+        </mxCell>
+        <mxCell id="FXGPDhTRSO2FZSW48CnP-30" value="Alice et Bob lisent à haute voix la phrase de sécurité" style="whiteSpace=wrap;html=1;fontSize=10;rounded=1;" parent="WIyWlLk6GJQsqaUBKTNV-1" vertex="1">
+          <mxGeometry x="300" y="720" width="120" height="50" as="geometry" />
+        </mxCell>
+        <mxCell id="FXGPDhTRSO2FZSW48CnP-37" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=1;entryY=0.5;entryDx=0;entryDy=0;" parent="WIyWlLk6GJQsqaUBKTNV-1" source="FXGPDhTRSO2FZSW48CnP-34" target="WIyWlLk6GJQsqaUBKTNV-12" edge="1">
+          <mxGeometry relative="1" as="geometry" />
+        </mxCell>
+        <mxCell id="FXGPDhTRSO2FZSW48CnP-38" value="Oui" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" parent="FXGPDhTRSO2FZSW48CnP-37" vertex="1" connectable="0">
+          <mxGeometry x="-0.3086" y="-2" relative="1" as="geometry">
+            <mxPoint as="offset" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="FXGPDhTRSO2FZSW48CnP-39" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=1;entryY=0.5;entryDx=0;entryDy=0;jumpStyle=sharp;jumpSize=8;" parent="WIyWlLk6GJQsqaUBKTNV-1" source="FXGPDhTRSO2FZSW48CnP-34" target="WIyWlLk6GJQsqaUBKTNV-11" edge="1">
+          <mxGeometry relative="1" as="geometry">
+            <Array as="points">
+              <mxPoint x="530" y="690" />
+              <mxPoint x="530" y="545" />
+            </Array>
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="FXGPDhTRSO2FZSW48CnP-40" value="Non" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" parent="FXGPDhTRSO2FZSW48CnP-39" vertex="1" connectable="0">
+          <mxGeometry x="-0.7617" relative="1" as="geometry">
+            <mxPoint as="offset" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="FXGPDhTRSO2FZSW48CnP-34" value="Ré-essayer ?" style="rhombus;whiteSpace=wrap;html=1;" parent="WIyWlLk6GJQsqaUBKTNV-1" vertex="1">
+          <mxGeometry x="660" y="650" width="80" height="80" as="geometry" />
+        </mxCell>
+        <mxCell id="FXGPDhTRSO2FZSW48CnP-49" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" parent="WIyWlLk6GJQsqaUBKTNV-1" source="FXGPDhTRSO2FZSW48CnP-46" target="FXGPDhTRSO2FZSW48CnP-48" edge="1">
+          <mxGeometry relative="1" as="geometry" />
+        </mxCell>
+        <mxCell id="FXGPDhTRSO2FZSW48CnP-46" value="Alice et Bob utilisent la clé symmétrique pour chiffrer leurs transmissions" style="whiteSpace=wrap;html=1;rounded=0;" parent="WIyWlLk6GJQsqaUBKTNV-1" vertex="1">
+          <mxGeometry x="340" y="920" width="120" height="60" as="geometry" />
+        </mxCell>
+        <mxCell id="FXGPDhTRSO2FZSW48CnP-48" value="" style="rhombus;whiteSpace=wrap;html=1;" parent="WIyWlLk6GJQsqaUBKTNV-1" vertex="1">
+          <mxGeometry x="360" y="1020" width="80" height="80" as="geometry" />
+        </mxCell>
+      </root>
+    </mxGraphModel>
+  </diagram>
+  <diagram id="c7L-flsM9ZWaCx455Pfy" name="Transport Layer - 0">
+    <mxGraphModel dx="1434" dy="835" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="850" pageHeight="1100" math="0" shadow="0">
+      <root>
+        <mxCell id="0" />
+        <mxCell id="1" parent="0" />
+      </root>
+    </mxGraphModel>
+  </diagram>
+  <diagram id="4Sb7mgJDpsadGym-U4wz" name="Protocol Layer - 0">
+    <mxGraphModel dx="1434" dy="835" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="850" pageHeight="1100" math="0" shadow="0">
+      <root>
+        <mxCell id="0" />
+        <mxCell id="1" parent="0" />
+        <mxCell id="b_xV4iUWIxmdZCAYY4YR-1" value="" style="html=1;shadow=0;dashed=0;align=center;verticalAlign=middle;shape=mxgraph.arrows2.arrow;dy=0;dx=10;notch=0;" parent="1" vertex="1">
+          <mxGeometry x="160" y="120" width="440" height="120" as="geometry" />
+        </mxCell>
+        <mxCell id="O_eM33N56VtHnDaMz1H4-1" value="ALICE" style="shape=umlLifeline;perimeter=lifelinePerimeter;whiteSpace=wrap;html=1;container=1;dropTarget=0;collapsible=0;recursiveResize=0;outlineConnect=0;portConstraint=eastwest;newEdgeStyle={&quot;curved&quot;:0,&quot;rounded&quot;:0};participant=umlEntity;strokeWidth=2;" parent="1" vertex="1">
+          <mxGeometry x="120" y="40" width="40" height="3110" as="geometry" />
+        </mxCell>
+        <mxCell id="O_eM33N56VtHnDaMz1H4-2" value="BOB" style="shape=umlLifeline;perimeter=lifelinePerimeter;whiteSpace=wrap;html=1;container=1;dropTarget=0;collapsible=0;recursiveResize=0;outlineConnect=0;portConstraint=eastwest;newEdgeStyle={&quot;curved&quot;:0,&quot;rounded&quot;:0};participant=umlEntity;strokeWidth=2;" parent="1" vertex="1">
+          <mxGeometry x="690" y="40" width="40" height="3110" as="geometry" />
+        </mxCell>
+        <mxCell id="b_xV4iUWIxmdZCAYY4YR-2" value="PING" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontSize=23;" parent="1" vertex="1">
+          <mxGeometry x="385" y="65" width="80" height="40" as="geometry" />
+        </mxCell>
+        <mxCell id="n3lF8vaYaHAhAfaeaFZn-1" value="Nonce" style="swimlane;whiteSpace=wrap;html=1;" parent="1" vertex="1">
+          <mxGeometry x="180" y="130" width="105" height="80" as="geometry">
+            <mxRectangle x="210" y="130" width="80" height="30" as="alternateBounds" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="n3lF8vaYaHAhAfaeaFZn-6" value="&lt;div&gt;sha256 (&lt;/div&gt;&lt;div&gt;numéro alice +&lt;/div&gt;&lt;div&gt;numéro bob +&lt;/div&gt;&lt;div&gt;timestamp +&lt;/div&gt;&lt;div&gt;random&lt;br&gt;&lt;/div&gt;&lt;div&gt;) / ~2 (left part)&lt;br&gt;&lt;/div&gt;" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;fontSize=7;" parent="n3lF8vaYaHAhAfaeaFZn-1" vertex="1">
+          <mxGeometry y="25" width="100" height="55" as="geometry" />
+        </mxCell>
+        <mxCell id="n3lF8vaYaHAhAfaeaFZn-2" value="Version" style="swimlane;whiteSpace=wrap;html=1;" parent="1" vertex="1">
+          <mxGeometry x="305" y="130" width="58.75" height="80" as="geometry" />
+        </mxCell>
+        <mxCell id="pWkGvNQAXuiST1IiWYlx-1" value="(0-128)" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="n3lF8vaYaHAhAfaeaFZn-2" vertex="1">
+          <mxGeometry x="3.75" y="30" width="51.25" height="25" as="geometry" />
+        </mxCell>
+        <mxCell id="n3lF8vaYaHAhAfaeaFZn-4" value="Checksum" style="swimlane;whiteSpace=wrap;html=1;" parent="1" vertex="1">
+          <mxGeometry x="455" y="130" width="90" height="80" as="geometry" />
+        </mxCell>
+        <mxCell id="n3lF8vaYaHAhAfaeaFZn-7" value="CRC-32" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="n3lF8vaYaHAhAfaeaFZn-4" vertex="1">
+          <mxGeometry x="15" y="25" width="60" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="XvZTtdEB18xY6m2a5fJO-1" value="" style="html=1;shadow=0;dashed=0;align=center;verticalAlign=middle;shape=mxgraph.arrows2.arrow;dy=0;dx=10;notch=0;rotation=-180;" parent="1" vertex="1">
+          <mxGeometry x="280" y="280" width="410" height="190" as="geometry" />
+        </mxCell>
+        <mxCell id="XvZTtdEB18xY6m2a5fJO-2" value="Timestamp" style="swimlane;whiteSpace=wrap;html=1;" parent="1" vertex="1">
+          <mxGeometry x="300" y="290" width="90" height="60" as="geometry">
+            <mxRectangle x="210" y="130" width="80" height="30" as="alternateBounds" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="XvZTtdEB18xY6m2a5fJO-3" value="timestamp" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;fontSize=10;strokeWidth=1;" parent="XvZTtdEB18xY6m2a5fJO-2" vertex="1">
+          <mxGeometry x="11.25" y="27.5" width="67.5" height="25" as="geometry" />
+        </mxCell>
+        <mxCell id="XvZTtdEB18xY6m2a5fJO-4" value="Version" style="swimlane;whiteSpace=wrap;html=1;" parent="1" vertex="1">
+          <mxGeometry x="405.63" y="290" width="58.75" height="60" as="geometry" />
+        </mxCell>
+        <mxCell id="XvZTtdEB18xY6m2a5fJO-11" value="0" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="XvZTtdEB18xY6m2a5fJO-4" vertex="1">
+          <mxGeometry y="25" width="60" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="XvZTtdEB18xY6m2a5fJO-5" value="Checksum" style="swimlane;whiteSpace=wrap;html=1;" parent="1" vertex="1">
+          <mxGeometry x="590" y="380" width="85" height="60" as="geometry" />
+        </mxCell>
+        <mxCell id="XvZTtdEB18xY6m2a5fJO-6" value="CRC-32" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="XvZTtdEB18xY6m2a5fJO-5" vertex="1">
+          <mxGeometry x="12.5" y="25" width="60" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="XvZTtdEB18xY6m2a5fJO-9" value="Answer" style="swimlane;whiteSpace=wrap;html=1;" parent="1" vertex="1">
+          <mxGeometry x="482.5" y="290" width="57.5" height="60" as="geometry" />
+        </mxCell>
+        <mxCell id="XvZTtdEB18xY6m2a5fJO-10" value="&lt;div&gt;YES&lt;/div&gt;&lt;div&gt;NO&lt;br&gt;&lt;/div&gt;" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="1" vertex="1">
+          <mxGeometry x="484.38" y="315" width="53.75" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="XvZTtdEB18xY6m2a5fJO-13" value="HANDSHAKE" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontSize=23;" parent="1" vertex="1">
+          <mxGeometry x="350" y="510" width="170" height="40" as="geometry" />
+        </mxCell>
+        <mxCell id="XvZTtdEB18xY6m2a5fJO-14" value="" style="html=1;shadow=0;dashed=0;align=center;verticalAlign=middle;shape=mxgraph.arrows2.arrow;dy=0;dx=10;notch=0;" parent="1" vertex="1">
+          <mxGeometry x="160" y="570" width="410" height="220" as="geometry" />
+        </mxCell>
+        <mxCell id="XvZTtdEB18xY6m2a5fJO-15" value="Clé éphémère" style="swimlane;whiteSpace=wrap;html=1;" parent="1" vertex="1">
+          <mxGeometry x="170" y="580" width="105" height="80" as="geometry">
+            <mxRectangle x="210" y="130" width="80" height="30" as="alternateBounds" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="pP7SjZfcCiBg3d1TCkzP-13" value="Clé (publique) générée aléatoirement" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;fontSize=11;" parent="XvZTtdEB18xY6m2a5fJO-15" vertex="1">
+          <mxGeometry y="30" width="100" height="40" as="geometry" />
+        </mxCell>
+        <mxCell id="XvZTtdEB18xY6m2a5fJO-17" value="Signature" style="swimlane;whiteSpace=wrap;html=1;" parent="1" vertex="1">
+          <mxGeometry x="285" y="580" width="105" height="80" as="geometry" />
+        </mxCell>
+        <mxCell id="pP7SjZfcCiBg3d1TCkzP-14" value="PubkeyFixe. sign(clé éphémère)" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="XvZTtdEB18xY6m2a5fJO-17" vertex="1">
+          <mxGeometry y="20" width="100" height="60" as="geometry" />
+        </mxCell>
+        <mxCell id="XvZTtdEB18xY6m2a5fJO-18" value="Checksum" style="swimlane;whiteSpace=wrap;html=1;" parent="1" vertex="1">
+          <mxGeometry x="486.25" y="580" width="65" height="80" as="geometry" />
+        </mxCell>
+        <mxCell id="XvZTtdEB18xY6m2a5fJO-19" value="CRC-32" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="XvZTtdEB18xY6m2a5fJO-18" vertex="1">
+          <mxGeometry x="2.5" y="30" width="60" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="pP7SjZfcCiBg3d1TCkzP-15" value="PFS" style="swimlane;whiteSpace=wrap;html=1;" parent="1" vertex="1">
+          <mxGeometry x="402.81" y="580" width="71.88" height="80" as="geometry" />
+        </mxCell>
+        <mxCell id="pP7SjZfcCiBg3d1TCkzP-16" value="hash( preuve de convo précédente)" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;fontSize=10;" parent="pP7SjZfcCiBg3d1TCkzP-15" vertex="1">
+          <mxGeometry x="6.57" y="30" width="60" height="40" as="geometry" />
+        </mxCell>
+        <mxCell id="pP7SjZfcCiBg3d1TCkzP-17" value="" style="html=1;shadow=0;dashed=0;align=center;verticalAlign=middle;shape=mxgraph.arrows2.arrow;dy=0;dx=10;notch=0;rotation=-180;" parent="1" vertex="1">
+          <mxGeometry x="285" y="830" width="410" height="180" as="geometry" />
+        </mxCell>
+        <mxCell id="pP7SjZfcCiBg3d1TCkzP-43" value="Clé éphémère" style="swimlane;whiteSpace=wrap;html=1;" parent="1" vertex="1">
+          <mxGeometry x="305" y="840" width="105" height="80" as="geometry">
+            <mxRectangle x="210" y="130" width="80" height="30" as="alternateBounds" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="pP7SjZfcCiBg3d1TCkzP-44" value="Clé (publique) générée aléatoirement" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;fontSize=11;" parent="pP7SjZfcCiBg3d1TCkzP-43" vertex="1">
+          <mxGeometry y="30" width="100" height="40" as="geometry" />
+        </mxCell>
+        <mxCell id="pP7SjZfcCiBg3d1TCkzP-45" value="Signature" style="swimlane;whiteSpace=wrap;html=1;" parent="1" vertex="1">
+          <mxGeometry x="420" y="840" width="105" height="80" as="geometry" />
+        </mxCell>
+        <mxCell id="pP7SjZfcCiBg3d1TCkzP-46" value="PubkeyFixe. sign(clé éphémère)" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="pP7SjZfcCiBg3d1TCkzP-45" vertex="1">
+          <mxGeometry y="20" width="100" height="60" as="geometry" />
+        </mxCell>
+        <mxCell id="pP7SjZfcCiBg3d1TCkzP-47" value="Checksum" style="swimlane;whiteSpace=wrap;html=1;" parent="1" vertex="1">
+          <mxGeometry x="621.25" y="840" width="65" height="80" as="geometry" />
+        </mxCell>
+        <mxCell id="pP7SjZfcCiBg3d1TCkzP-48" value="CRC-32" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="pP7SjZfcCiBg3d1TCkzP-47" vertex="1">
+          <mxGeometry x="2.5" y="30" width="60" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="pP7SjZfcCiBg3d1TCkzP-49" value="PFS" style="swimlane;whiteSpace=wrap;html=1;" parent="1" vertex="1">
+          <mxGeometry x="537.81" y="840" width="71.88" height="80" as="geometry" />
+        </mxCell>
+        <mxCell id="pP7SjZfcCiBg3d1TCkzP-50" value="hash( preuve de convo précédente )" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;fontSize=10;" parent="pP7SjZfcCiBg3d1TCkzP-49" vertex="1">
+          <mxGeometry x="6.57" y="30" width="60" height="40" as="geometry" />
+        </mxCell>
+        <mxCell id="pP7SjZfcCiBg3d1TCkzP-54" value="Timestamp" style="swimlane;whiteSpace=wrap;html=1;" parent="1" vertex="1">
+          <mxGeometry x="182.5" y="690" width="80" height="70" as="geometry">
+            <mxRectangle x="210" y="130" width="80" height="30" as="alternateBounds" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="pP7SjZfcCiBg3d1TCkzP-55" value="timestamp" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;fontSize=10;strokeWidth=1;" parent="pP7SjZfcCiBg3d1TCkzP-54" vertex="1">
+          <mxGeometry x="6.25" y="32.5" width="67.5" height="25" as="geometry" />
+        </mxCell>
+        <mxCell id="pP7SjZfcCiBg3d1TCkzP-56" value="Timestamp" style="swimlane;whiteSpace=wrap;html=1;" parent="1" vertex="1">
+          <mxGeometry x="606.25" y="930" width="80" height="70" as="geometry">
+            <mxRectangle x="210" y="130" width="80" height="30" as="alternateBounds" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="pP7SjZfcCiBg3d1TCkzP-57" value="timestamp" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;fontSize=10;strokeWidth=1;" parent="pP7SjZfcCiBg3d1TCkzP-56" vertex="1">
+          <mxGeometry x="6.25" y="32.5" width="67.5" height="25" as="geometry" />
+        </mxCell>
+        <mxCell id="pP7SjZfcCiBg3d1TCkzP-58" value="" style="html=1;shadow=0;dashed=0;align=center;verticalAlign=middle;shape=mxgraph.arrows2.arrow;dy=0;dx=10;notch=0;" parent="1" vertex="1">
+          <mxGeometry x="160" y="1160" width="450" height="200" as="geometry" />
+        </mxCell>
+        <mxCell id="pP7SjZfcCiBg3d1TCkzP-59" value="ENCRYPTED COMS" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontSize=23;" parent="1" vertex="1">
+          <mxGeometry x="305" y="1100" width="240" height="40" as="geometry" />
+        </mxCell>
+        <mxCell id="pP7SjZfcCiBg3d1TCkzP-60" value="129b" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="1" vertex="1">
+          <mxGeometry x="200" y="210" width="60" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="pP7SjZfcCiBg3d1TCkzP-61" value="7b" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="1" vertex="1">
+          <mxGeometry x="303.75" y="210" width="60" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="pP7SjZfcCiBg3d1TCkzP-62" value="32b" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="1" vertex="1">
+          <mxGeometry x="470" y="210" width="60" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="pP7SjZfcCiBg3d1TCkzP-63" value="= 172b" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="1" vertex="1">
+          <mxGeometry x="530" y="210" width="60" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="pP7SjZfcCiBg3d1TCkzP-66" value="32b" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="1" vertex="1">
+          <mxGeometry x="313" y="350" width="60" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="pP7SjZfcCiBg3d1TCkzP-67" value="7b" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="1" vertex="1">
+          <mxGeometry x="406.75" y="350" width="60" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="pP7SjZfcCiBg3d1TCkzP-68" value="1b" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="1" vertex="1">
+          <mxGeometry x="479.25" y="350" width="60" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="pP7SjZfcCiBg3d1TCkzP-69" value="32b" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="1" vertex="1">
+          <mxGeometry x="600.5" y="440" width="60" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="pP7SjZfcCiBg3d1TCkzP-70" value="= 76b" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="1" vertex="1">
+          <mxGeometry x="426.25" y="420" width="60" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="pP7SjZfcCiBg3d1TCkzP-71" value="264b" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="1" vertex="1">
+          <mxGeometry x="193" y="660" width="60" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="pP7SjZfcCiBg3d1TCkzP-72" value="512b" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="1" vertex="1">
+          <mxGeometry x="307.5" y="660" width="60" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="pP7SjZfcCiBg3d1TCkzP-73" value="256b" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="1" vertex="1">
+          <mxGeometry x="409.38" y="660" width="60" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="pP7SjZfcCiBg3d1TCkzP-74" value="32b" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="1" vertex="1">
+          <mxGeometry x="488.75" y="660" width="60" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="pP7SjZfcCiBg3d1TCkzP-75" value="32b" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="1" vertex="1">
+          <mxGeometry x="192.5" y="760" width="60" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="pP7SjZfcCiBg3d1TCkzP-76" value="=1096b" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="1" vertex="1">
+          <mxGeometry x="315" y="750" width="60" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="pP7SjZfcCiBg3d1TCkzP-77" value="=1096b" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="1" vertex="1">
+          <mxGeometry x="327.5" y="970" width="60" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="_H5URFloX_BVB2BL7kO6-1" value="CRC ?" style="swimlane;whiteSpace=wrap;html=1;fillColor=#008a00;fontColor=#ffffff;strokeColor=#005700;" parent="1" vertex="1">
+          <mxGeometry x="375" y="1270" width="63.25" height="60" as="geometry" />
+        </mxCell>
+        <mxCell id="_H5URFloX_BVB2BL7kO6-2" value="CRC-32" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="_H5URFloX_BVB2BL7kO6-1" vertex="1">
+          <mxGeometry x="1.6199999999999992" y="25" width="60" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="_H5URFloX_BVB2BL7kO6-3" value="Flag" style="swimlane;whiteSpace=wrap;html=1;fillColor=#008a00;fontColor=#ffffff;strokeColor=#005700;" parent="1" vertex="1">
+          <mxGeometry x="180" y="1170" width="65" height="60" as="geometry" />
+        </mxCell>
+        <mxCell id="_H5URFloX_BVB2BL7kO6-4" value="To determine" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="_H5URFloX_BVB2BL7kO6-3" vertex="1">
+          <mxGeometry x="2.5" y="25" width="60" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="_H5URFloX_BVB2BL7kO6-5" value="nbretry" style="swimlane;whiteSpace=wrap;html=1;" parent="1" vertex="1">
+          <mxGeometry x="344.38" y="1170" width="65" height="60" as="geometry" />
+        </mxCell>
+        <mxCell id="_H5URFloX_BVB2BL7kO6-6" value="y" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="_H5URFloX_BVB2BL7kO6-5" vertex="1">
+          <mxGeometry x="2.5" y="25" width="60" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="_H5URFloX_BVB2BL7kO6-7" value="msg_len" style="swimlane;whiteSpace=wrap;html=1;fillColor=#008a00;fontColor=#ffffff;strokeColor=#005700;" parent="1" vertex="1">
+          <mxGeometry x="262.5" y="1170" width="65" height="60" as="geometry">
+            <mxRectangle x="262.5" y="1170" width="90" height="30" as="alternateBounds" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="_H5URFloX_BVB2BL7kO6-8" value="XXX" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="_H5URFloX_BVB2BL7kO6-7" vertex="1">
+          <mxGeometry x="2.5" y="25" width="60" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="_H5URFloX_BVB2BL7kO6-9" value="msg" style="swimlane;whiteSpace=wrap;html=1;fillColor=#0050ef;fontColor=#ffffff;strokeColor=#001DBC;" parent="1" vertex="1">
+          <mxGeometry x="187.5" y="1270" width="65" height="60" as="geometry" />
+        </mxCell>
+        <mxCell id="_H5URFloX_BVB2BL7kO6-10" value="BBB" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="_H5URFloX_BVB2BL7kO6-9" vertex="1">
+          <mxGeometry x="2.5" y="30" width="60" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="_H5URFloX_BVB2BL7kO6-11" value="16b" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="1" vertex="1">
+          <mxGeometry x="180" y="1230" width="60" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="_H5URFloX_BVB2BL7kO6-12" value="8b" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="1" vertex="1">
+          <mxGeometry x="349.38" y="1230" width="55" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="_H5URFloX_BVB2BL7kO6-13" value="16b" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="1" vertex="1">
+          <mxGeometry x="267.5" y="1230" width="55" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="_H5URFloX_BVB2BL7kO6-14" value="96b" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="1" vertex="1">
+          <mxGeometry x="510" y="1230" width="55" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="_H5URFloX_BVB2BL7kO6-15" value="32b" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="1" vertex="1">
+          <mxGeometry x="379.12" y="1330" width="55" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="_H5URFloX_BVB2BL7kO6-16" value="= (180b ~ 212b) + yyy" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="1" vertex="1">
+          <mxGeometry x="465" y="1285" width="130" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="pWkGvNQAXuiST1IiWYlx-2" value="Cypher" style="swimlane;whiteSpace=wrap;html=1;" parent="1" vertex="1">
+          <mxGeometry x="375" y="130" width="58.75" height="80" as="geometry" />
+        </mxCell>
+        <mxCell id="pWkGvNQAXuiST1IiWYlx-3" value="(0-16)" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="pWkGvNQAXuiST1IiWYlx-2" vertex="1">
+          <mxGeometry x="3.75" y="30" width="51.25" height="25" as="geometry" />
+        </mxCell>
+        <mxCell id="pWkGvNQAXuiST1IiWYlx-4" value="4b" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="1" vertex="1">
+          <mxGeometry x="375" y="210" width="55" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="pWkGvNQAXuiST1IiWYlx-5" value="Cypher" style="swimlane;whiteSpace=wrap;html=1;" parent="1" vertex="1">
+          <mxGeometry x="600" y="290" width="58.75" height="60" as="geometry" />
+        </mxCell>
+        <mxCell id="pWkGvNQAXuiST1IiWYlx-6" value="(0-16)" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="pWkGvNQAXuiST1IiWYlx-5" vertex="1">
+          <mxGeometry x="3.75" y="30" width="51.25" height="25" as="geometry" />
+        </mxCell>
+        <mxCell id="pWkGvNQAXuiST1IiWYlx-7" value="4b" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="1" vertex="1">
+          <mxGeometry x="601.88" y="350" width="55" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="pWkGvNQAXuiST1IiWYlx-8" value="status" style="swimlane;whiteSpace=wrap;html=1;" parent="1" vertex="1">
+          <mxGeometry x="425" y="1170" width="65" height="60" as="geometry" />
+        </mxCell>
+        <mxCell id="pWkGvNQAXuiST1IiWYlx-9" value="CRC ?" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="pWkGvNQAXuiST1IiWYlx-8" vertex="1">
+          <mxGeometry x="2.5" y="25" width="60" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="pWkGvNQAXuiST1IiWYlx-10" value="4b" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="1" vertex="1">
+          <mxGeometry x="428.75" y="1230" width="55" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="pWkGvNQAXuiST1IiWYlx-11" value="iv" style="swimlane;whiteSpace=wrap;html=1;" parent="1" vertex="1">
+          <mxGeometry x="505" y="1170" width="65" height="60" as="geometry" />
+        </mxCell>
+        <mxCell id="pWkGvNQAXuiST1IiWYlx-12" value="random&lt;div&gt;(+Z)&lt;/div&gt;" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="pWkGvNQAXuiST1IiWYlx-11" vertex="1">
+          <mxGeometry x="2.5" y="25" width="60" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="pWkGvNQAXuiST1IiWYlx-13" value="BBB b" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="1" vertex="1">
+          <mxGeometry x="193" y="1330" width="55" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="pWkGvNQAXuiST1IiWYlx-14" value="MAC" style="swimlane;whiteSpace=wrap;html=1;fillColor=#008a00;fontColor=#ffffff;strokeColor=#005700;" parent="1" vertex="1">
+          <mxGeometry x="286.13" y="1270" width="63.25" height="60" as="geometry" />
+        </mxCell>
+        <mxCell id="pWkGvNQAXuiST1IiWYlx-15" value="AEAD" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="pWkGvNQAXuiST1IiWYlx-14" vertex="1">
+          <mxGeometry x="1.6199999999999992" y="25" width="60" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="pWkGvNQAXuiST1IiWYlx-16" value="128b" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="1" vertex="1">
+          <mxGeometry x="290.25" y="1330" width="55" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="pWkGvNQAXuiST1IiWYlx-17" value="Green = clear data" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;fillColor=#008a00;fontColor=#ffffff;strokeColor=#005700;" parent="1" vertex="1">
+          <mxGeometry x="10" y="1170" width="110" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="pWkGvNQAXuiST1IiWYlx-18" value="&lt;font style=&quot;color: light-dark(rgb(0, 0, 0), rgb(255, 255, 255));&quot;&gt;White = additional data&lt;/font&gt;" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;fillColor=none;strokeColor=light-dark(#6C8EBF,#FFFFFF);" parent="1" vertex="1">
+          <mxGeometry y="1220" width="130" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="pWkGvNQAXuiST1IiWYlx-19" value="Blue = encrypted data" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;fillColor=#0050ef;fontColor=#ffffff;strokeColor=#001DBC;" parent="1" vertex="1">
+          <mxGeometry x="10" y="1270" width="110" height="30" as="geometry" />
+        </mxCell>
+      </root>
+    </mxGraphModel>
+  </diagram>
+  <diagram name="Protocol Layer - 1" id="_rkrwzJg5buKJxYS8faK">
+    <mxGraphModel dx="1062" dy="1719" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="850" pageHeight="1100" math="0" shadow="0">
+      <root>
+        <mxCell id="0ZE-dMPOFneTTZtpNr96-0" />
+        <mxCell id="0ZE-dMPOFneTTZtpNr96-1" parent="0ZE-dMPOFneTTZtpNr96-0" />
+        <mxCell id="0ZE-dMPOFneTTZtpNr96-2" value="" style="html=1;shadow=0;dashed=0;align=center;verticalAlign=middle;shape=mxgraph.arrows2.arrow;dy=0;dx=10;notch=0;" vertex="1" parent="0ZE-dMPOFneTTZtpNr96-1">
+          <mxGeometry x="160" y="120" width="260" height="120" as="geometry" />
+        </mxCell>
+        <mxCell id="0ZE-dMPOFneTTZtpNr96-3" value="&lt;font style=&quot;color: rgb(255, 65, 27);&quot;&gt;&lt;b&gt;ALICE&amp;nbsp; (INITIATOR)&lt;/b&gt;&lt;/font&gt;" style="shape=umlLifeline;perimeter=lifelinePerimeter;whiteSpace=wrap;html=1;container=1;dropTarget=0;collapsible=0;recursiveResize=0;outlineConnect=0;portConstraint=eastwest;newEdgeStyle={&quot;curved&quot;:0,&quot;rounded&quot;:0};participant=umlEntity;strokeWidth=2;" vertex="1" parent="0ZE-dMPOFneTTZtpNr96-1">
+          <mxGeometry x="120" y="40" width="40" height="3110" as="geometry" />
+        </mxCell>
+        <mxCell id="0ZE-dMPOFneTTZtpNr96-4" value="&lt;font&gt;BOB&lt;/font&gt;" style="shape=umlLifeline;perimeter=lifelinePerimeter;whiteSpace=wrap;html=1;container=1;dropTarget=0;collapsible=0;recursiveResize=0;outlineConnect=0;portConstraint=eastwest;newEdgeStyle={&quot;curved&quot;:0,&quot;rounded&quot;:0};participant=umlEntity;strokeWidth=2;" vertex="1" parent="0ZE-dMPOFneTTZtpNr96-1">
+          <mxGeometry x="690" y="40" width="40" height="3110" as="geometry" />
+        </mxCell>
+        <mxCell id="0ZE-dMPOFneTTZtpNr96-5" value="PING" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontSize=23;" vertex="1" parent="0ZE-dMPOFneTTZtpNr96-1">
+          <mxGeometry x="385" y="65" width="80" height="40" as="geometry" />
+        </mxCell>
+        <mxCell id="0ZE-dMPOFneTTZtpNr96-8" value="Version" style="swimlane;whiteSpace=wrap;html=1;" vertex="1" parent="0ZE-dMPOFneTTZtpNr96-1">
+          <mxGeometry x="171.25" y="130" width="58.75" height="80" as="geometry" />
+        </mxCell>
+        <mxCell id="0ZE-dMPOFneTTZtpNr96-9" value="(0-128)" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" vertex="1" parent="0ZE-dMPOFneTTZtpNr96-8">
+          <mxGeometry x="3.75" y="30" width="51.25" height="25" as="geometry" />
+        </mxCell>
+        <mxCell id="0ZE-dMPOFneTTZtpNr96-12" value="" style="html=1;shadow=0;dashed=0;align=center;verticalAlign=middle;shape=mxgraph.arrows2.arrow;dy=0;dx=10;notch=0;rotation=-180;" vertex="1" parent="0ZE-dMPOFneTTZtpNr96-1">
+          <mxGeometry x="350" y="280" width="340" height="190" as="geometry" />
+        </mxCell>
+        <mxCell id="0ZE-dMPOFneTTZtpNr96-13" value="Timestamp" style="swimlane;whiteSpace=wrap;html=1;" vertex="1" parent="0ZE-dMPOFneTTZtpNr96-1">
+          <mxGeometry x="380" y="290" width="90" height="60" as="geometry">
+            <mxRectangle x="210" y="130" width="80" height="30" as="alternateBounds" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="0ZE-dMPOFneTTZtpNr96-14" value="timestamp" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;fontSize=10;strokeWidth=1;" vertex="1" parent="0ZE-dMPOFneTTZtpNr96-13">
+          <mxGeometry x="11.25" y="27.5" width="67.5" height="25" as="geometry" />
+        </mxCell>
+        <mxCell id="0ZE-dMPOFneTTZtpNr96-15" value="Version" style="swimlane;whiteSpace=wrap;html=1;" vertex="1" parent="0ZE-dMPOFneTTZtpNr96-1">
+          <mxGeometry x="479.76" y="290" width="58.75" height="60" as="geometry" />
+        </mxCell>
+        <mxCell id="0ZE-dMPOFneTTZtpNr96-16" value="0" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" vertex="1" parent="0ZE-dMPOFneTTZtpNr96-15">
+          <mxGeometry y="25" width="60" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="0ZE-dMPOFneTTZtpNr96-19" value="Answer" style="swimlane;whiteSpace=wrap;html=1;" vertex="1" parent="0ZE-dMPOFneTTZtpNr96-1">
+          <mxGeometry x="548.76" y="290" width="57.5" height="60" as="geometry" />
+        </mxCell>
+        <mxCell id="0ZE-dMPOFneTTZtpNr96-20" value="&lt;div&gt;YES&lt;/div&gt;&lt;div&gt;NO&lt;br&gt;&lt;/div&gt;" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" vertex="1" parent="0ZE-dMPOFneTTZtpNr96-1">
+          <mxGeometry x="533.76" y="315" width="53.75" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="0ZE-dMPOFneTTZtpNr96-21" value="HANDSHAKE" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontSize=23;" vertex="1" parent="0ZE-dMPOFneTTZtpNr96-1">
+          <mxGeometry x="350" y="510" width="170" height="40" as="geometry" />
+        </mxCell>
+        <mxCell id="0ZE-dMPOFneTTZtpNr96-22" value="" style="html=1;shadow=0;dashed=0;align=center;verticalAlign=middle;shape=mxgraph.arrows2.arrow;dy=0;dx=10;notch=0;" vertex="1" parent="0ZE-dMPOFneTTZtpNr96-1">
+          <mxGeometry x="160" y="570" width="410" height="220" as="geometry" />
+        </mxCell>
+        <mxCell id="0ZE-dMPOFneTTZtpNr96-23" value="Clé éphémère" style="swimlane;whiteSpace=wrap;html=1;" vertex="1" parent="0ZE-dMPOFneTTZtpNr96-1">
+          <mxGeometry x="170" y="580" width="105" height="80" as="geometry">
+            <mxRectangle x="210" y="130" width="80" height="30" as="alternateBounds" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="0ZE-dMPOFneTTZtpNr96-24" value="Clé (publique) générée aléatoirement" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;fontSize=11;" vertex="1" parent="0ZE-dMPOFneTTZtpNr96-23">
+          <mxGeometry y="30" width="100" height="40" as="geometry" />
+        </mxCell>
+        <mxCell id="0ZE-dMPOFneTTZtpNr96-25" value="" style="swimlane;whiteSpace=wrap;html=1;" vertex="1" parent="0ZE-dMPOFneTTZtpNr96-1">
+          <mxGeometry x="285" y="580" width="105" height="80" as="geometry" />
+        </mxCell>
+        <mxCell id="0ZE-dMPOFneTTZtpNr96-29" value="" style="swimlane;whiteSpace=wrap;html=1;" vertex="1" parent="0ZE-dMPOFneTTZtpNr96-1">
+          <mxGeometry x="402.81" y="580" width="71.88" height="80" as="geometry" />
+        </mxCell>
+        <mxCell id="0ZE-dMPOFneTTZtpNr96-31" value="" style="html=1;shadow=0;dashed=0;align=center;verticalAlign=middle;shape=mxgraph.arrows2.arrow;dy=0;dx=10;notch=0;rotation=-180;" vertex="1" parent="0ZE-dMPOFneTTZtpNr96-1">
+          <mxGeometry x="285" y="830" width="410" height="180" as="geometry" />
+        </mxCell>
+        <mxCell id="0ZE-dMPOFneTTZtpNr96-32" value="Clé éphémère" style="swimlane;whiteSpace=wrap;html=1;" vertex="1" parent="0ZE-dMPOFneTTZtpNr96-1">
+          <mxGeometry x="305" y="840" width="105" height="80" as="geometry">
+            <mxRectangle x="210" y="130" width="80" height="30" as="alternateBounds" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="0ZE-dMPOFneTTZtpNr96-33" value="Clé (publique) générée aléatoirement" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;fontSize=11;" vertex="1" parent="0ZE-dMPOFneTTZtpNr96-32">
+          <mxGeometry y="30" width="100" height="40" as="geometry" />
+        </mxCell>
+        <mxCell id="0ZE-dMPOFneTTZtpNr96-34" value="" style="swimlane;whiteSpace=wrap;html=1;startSize=23;" vertex="1" parent="0ZE-dMPOFneTTZtpNr96-1">
+          <mxGeometry x="420" y="840" width="105" height="80" as="geometry" />
+        </mxCell>
+        <mxCell id="0ZE-dMPOFneTTZtpNr96-38" value="" style="swimlane;whiteSpace=wrap;html=1;" vertex="1" parent="0ZE-dMPOFneTTZtpNr96-1">
+          <mxGeometry x="537.81" y="840" width="71.88" height="80" as="geometry" />
+        </mxCell>
+        <mxCell id="0ZE-dMPOFneTTZtpNr96-40" value="Timestamp" style="swimlane;whiteSpace=wrap;html=1;" vertex="1" parent="0ZE-dMPOFneTTZtpNr96-1">
+          <mxGeometry x="182.5" y="690" width="80" height="70" as="geometry">
+            <mxRectangle x="210" y="130" width="80" height="30" as="alternateBounds" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="0ZE-dMPOFneTTZtpNr96-41" value="timestamp" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;fontSize=10;strokeWidth=1;" vertex="1" parent="0ZE-dMPOFneTTZtpNr96-40">
+          <mxGeometry x="6.25" y="32.5" width="67.5" height="25" as="geometry" />
+        </mxCell>
+        <mxCell id="0ZE-dMPOFneTTZtpNr96-42" value="Timestamp" style="swimlane;whiteSpace=wrap;html=1;" vertex="1" parent="0ZE-dMPOFneTTZtpNr96-1">
+          <mxGeometry x="606.25" y="930" width="80" height="70" as="geometry">
+            <mxRectangle x="210" y="130" width="80" height="30" as="alternateBounds" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="0ZE-dMPOFneTTZtpNr96-43" value="timestamp" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;fontSize=10;strokeWidth=1;" vertex="1" parent="0ZE-dMPOFneTTZtpNr96-42">
+          <mxGeometry x="6.25" y="32.5" width="67.5" height="25" as="geometry" />
+        </mxCell>
+        <mxCell id="0ZE-dMPOFneTTZtpNr96-44" value="" style="html=1;shadow=0;dashed=0;align=center;verticalAlign=middle;shape=mxgraph.arrows2.arrow;dy=0;dx=10;notch=0;" vertex="1" parent="0ZE-dMPOFneTTZtpNr96-1">
+          <mxGeometry x="160" y="1160" width="450" height="200" as="geometry" />
+        </mxCell>
+        <mxCell id="0ZE-dMPOFneTTZtpNr96-45" value="ENCRYPTED COMS" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontSize=23;" vertex="1" parent="0ZE-dMPOFneTTZtpNr96-1">
+          <mxGeometry x="305" y="1100" width="240" height="40" as="geometry" />
+        </mxCell>
+        <mxCell id="0ZE-dMPOFneTTZtpNr96-47" value="7b" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" vertex="1" parent="0ZE-dMPOFneTTZtpNr96-1">
+          <mxGeometry x="170" y="210" width="60" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="0ZE-dMPOFneTTZtpNr96-49" value="= 48b" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" vertex="1" parent="0ZE-dMPOFneTTZtpNr96-1">
+          <mxGeometry x="350" y="210" width="60" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="0ZE-dMPOFneTTZtpNr96-50" value="16b" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" vertex="1" parent="0ZE-dMPOFneTTZtpNr96-1">
+          <mxGeometry x="393" y="350" width="60" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="0ZE-dMPOFneTTZtpNr96-51" value="7b" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" vertex="1" parent="0ZE-dMPOFneTTZtpNr96-1">
+          <mxGeometry x="479.13" y="350" width="60" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="0ZE-dMPOFneTTZtpNr96-52" value="1b" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" vertex="1" parent="0ZE-dMPOFneTTZtpNr96-1">
+          <mxGeometry x="545.51" y="350" width="60" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="0ZE-dMPOFneTTZtpNr96-54" value="= 32b" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" vertex="1" parent="0ZE-dMPOFneTTZtpNr96-1">
+          <mxGeometry x="465" y="395" width="60" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="0ZE-dMPOFneTTZtpNr96-55" value="264b" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" vertex="1" parent="0ZE-dMPOFneTTZtpNr96-1">
+          <mxGeometry x="193" y="660" width="60" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="0ZE-dMPOFneTTZtpNr96-56" value="512b" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" vertex="1" parent="0ZE-dMPOFneTTZtpNr96-1">
+          <mxGeometry x="307.5" y="660" width="60" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="0ZE-dMPOFneTTZtpNr96-57" value="256b" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" vertex="1" parent="0ZE-dMPOFneTTZtpNr96-1">
+          <mxGeometry x="409.38" y="660" width="60" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="0ZE-dMPOFneTTZtpNr96-59" value="16b" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" vertex="1" parent="0ZE-dMPOFneTTZtpNr96-1">
+          <mxGeometry x="192.5" y="760" width="60" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="0ZE-dMPOFneTTZtpNr96-60" value="=1096b" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" vertex="1" parent="0ZE-dMPOFneTTZtpNr96-1">
+          <mxGeometry x="315" y="750" width="60" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="0ZE-dMPOFneTTZtpNr96-61" value="=1096b" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" vertex="1" parent="0ZE-dMPOFneTTZtpNr96-1">
+          <mxGeometry x="327.5" y="970" width="60" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="0ZE-dMPOFneTTZtpNr96-66" value="nbretry" style="swimlane;whiteSpace=wrap;html=1;" vertex="1" parent="0ZE-dMPOFneTTZtpNr96-1">
+          <mxGeometry x="344.38" y="1170" width="65" height="60" as="geometry" />
+        </mxCell>
+        <mxCell id="0ZE-dMPOFneTTZtpNr96-67" value="y" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" vertex="1" parent="0ZE-dMPOFneTTZtpNr96-66">
+          <mxGeometry x="2.5" y="25" width="60" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="0ZE-dMPOFneTTZtpNr96-70" value="msg" style="swimlane;whiteSpace=wrap;html=1;fillColor=#0050ef;fontColor=#ffffff;strokeColor=#001DBC;" vertex="1" parent="0ZE-dMPOFneTTZtpNr96-1">
+          <mxGeometry x="187.5" y="1270" width="65" height="60" as="geometry" />
+        </mxCell>
+        <mxCell id="0ZE-dMPOFneTTZtpNr96-71" value="BBB" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" vertex="1" parent="0ZE-dMPOFneTTZtpNr96-70">
+          <mxGeometry x="2.5" y="30" width="60" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="0ZE-dMPOFneTTZtpNr96-73" value="8b" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" vertex="1" parent="0ZE-dMPOFneTTZtpNr96-1">
+          <mxGeometry x="349.38" y="1230" width="55" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="0ZE-dMPOFneTTZtpNr96-77" value="= (180b ~ 212b) + yyy" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" vertex="1" parent="0ZE-dMPOFneTTZtpNr96-1">
+          <mxGeometry x="465" y="1285" width="130" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="0ZE-dMPOFneTTZtpNr96-78" value="Cypher" style="swimlane;whiteSpace=wrap;html=1;" vertex="1" parent="0ZE-dMPOFneTTZtpNr96-1">
+          <mxGeometry x="240" y="130" width="58.75" height="80" as="geometry" />
+        </mxCell>
+        <mxCell id="0ZE-dMPOFneTTZtpNr96-79" value="(0-32)" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" vertex="1" parent="0ZE-dMPOFneTTZtpNr96-78">
+          <mxGeometry x="3.75" y="30" width="51.25" height="25" as="geometry" />
+        </mxCell>
+        <mxCell id="0ZE-dMPOFneTTZtpNr96-80" value="5b" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" vertex="1" parent="0ZE-dMPOFneTTZtpNr96-1">
+          <mxGeometry x="240" y="210" width="55" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="0ZE-dMPOFneTTZtpNr96-81" value="Cypher Offset" style="swimlane;whiteSpace=wrap;html=1;" vertex="1" parent="0ZE-dMPOFneTTZtpNr96-1">
+          <mxGeometry x="616.88" y="290" width="58.75" height="60" as="geometry" />
+        </mxCell>
+        <mxCell id="0ZE-dMPOFneTTZtpNr96-82" value="(0-8)" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" vertex="1" parent="0ZE-dMPOFneTTZtpNr96-81">
+          <mxGeometry x="3.75" y="30" width="51.25" height="25" as="geometry" />
+        </mxCell>
+        <mxCell id="0ZE-dMPOFneTTZtpNr96-83" value="4b" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" vertex="1" parent="0ZE-dMPOFneTTZtpNr96-1">
+          <mxGeometry x="618.76" y="350" width="55" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="0ZE-dMPOFneTTZtpNr96-84" value="status" style="swimlane;whiteSpace=wrap;html=1;" vertex="1" parent="0ZE-dMPOFneTTZtpNr96-1">
+          <mxGeometry x="425" y="1170" width="65" height="60" as="geometry" />
+        </mxCell>
+        <mxCell id="0ZE-dMPOFneTTZtpNr96-85" value="CRC ?" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" vertex="1" parent="0ZE-dMPOFneTTZtpNr96-84">
+          <mxGeometry x="2.5" y="25" width="60" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="0ZE-dMPOFneTTZtpNr96-86" value="4b" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" vertex="1" parent="0ZE-dMPOFneTTZtpNr96-1">
+          <mxGeometry x="428.75" y="1230" width="55" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="0ZE-dMPOFneTTZtpNr96-89" value="BBB b" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" vertex="1" parent="0ZE-dMPOFneTTZtpNr96-1">
+          <mxGeometry x="193" y="1330" width="55" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="0ZE-dMPOFneTTZtpNr96-90" value="MAC" style="swimlane;whiteSpace=wrap;html=1;fillColor=#008a00;fontColor=#ffffff;strokeColor=#005700;" vertex="1" parent="0ZE-dMPOFneTTZtpNr96-1">
+          <mxGeometry x="286.13" y="1270" width="63.25" height="60" as="geometry" />
+        </mxCell>
+        <mxCell id="0ZE-dMPOFneTTZtpNr96-91" value="AEAD" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" vertex="1" parent="0ZE-dMPOFneTTZtpNr96-90">
+          <mxGeometry x="1.6199999999999992" y="25" width="60" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="0ZE-dMPOFneTTZtpNr96-92" value="128b" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" vertex="1" parent="0ZE-dMPOFneTTZtpNr96-1">
+          <mxGeometry x="290.25" y="1330" width="55" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="0ZE-dMPOFneTTZtpNr96-93" value="Green = clear data" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;fillColor=#008a00;fontColor=#ffffff;strokeColor=#005700;" vertex="1" parent="0ZE-dMPOFneTTZtpNr96-1">
+          <mxGeometry x="10" y="1170" width="110" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="0ZE-dMPOFneTTZtpNr96-94" value="&lt;font style=&quot;color: light-dark(rgb(0, 0, 0), rgb(255, 255, 255));&quot;&gt;White = additional data&lt;/font&gt;" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;fillColor=none;strokeColor=light-dark(#6C8EBF,#FFFFFF);" vertex="1" parent="0ZE-dMPOFneTTZtpNr96-1">
+          <mxGeometry y="1220" width="130" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="0ZE-dMPOFneTTZtpNr96-95" value="Blue = encrypted data" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;fillColor=#0050ef;fontColor=#ffffff;strokeColor=#001DBC;" vertex="1" parent="0ZE-dMPOFneTTZtpNr96-1">
+          <mxGeometry x="10" y="1270" width="110" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="el23RTDFL3Ay36EOE6FN-0" value="Quality" style="swimlane;whiteSpace=wrap;html=1;" vertex="1" parent="0ZE-dMPOFneTTZtpNr96-1">
+          <mxGeometry x="308.75" y="130" width="58.75" height="80" as="geometry" />
+        </mxCell>
+        <mxCell id="el23RTDFL3Ay36EOE6FN-1" value="(0-16)" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" vertex="1" parent="el23RTDFL3Ay36EOE6FN-0">
+          <mxGeometry x="3.75" y="30" width="51.25" height="25" as="geometry" />
+        </mxCell>
+        <mxCell id="el23RTDFL3Ay36EOE6FN-2" value="4b" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" vertex="1" parent="0ZE-dMPOFneTTZtpNr96-1">
+          <mxGeometry x="308.75" y="210" width="55" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="el23RTDFL3Ay36EOE6FN-3" value="4b" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" vertex="1" parent="0ZE-dMPOFneTTZtpNr96-1">
+          <mxGeometry x="616.88" y="440" width="55" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="el23RTDFL3Ay36EOE6FN-4" value="Quality" style="swimlane;whiteSpace=wrap;html=1;" vertex="1" parent="0ZE-dMPOFneTTZtpNr96-1">
+          <mxGeometry x="616.88" y="380" width="58.75" height="60" as="geometry" />
+        </mxCell>
+        <mxCell id="el23RTDFL3Ay36EOE6FN-5" value="(0-16)" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" vertex="1" parent="el23RTDFL3Ay36EOE6FN-4">
+          <mxGeometry x="3.75" y="30" width="51.25" height="25" as="geometry" />
+        </mxCell>
+        <mxCell id="1WmqBiAd3lf2sxgMsw2H-0" value="Best Case Scenario&lt;div&gt;Noise_XK_25519_ChaChaPoly_SHA256&lt;/div&gt;" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;fontSize=25;fontStyle=1" vertex="1" parent="0ZE-dMPOFneTTZtpNr96-1">
+          <mxGeometry x="223" y="-20" width="405" height="30" as="geometry" />
+        </mxCell>
+      </root>
+    </mxGraphModel>
+  </diagram>
+</mxfile>

protocol_prototype/Prototype/cli.py

@@ -0,0 +1,91 @@
+import argparse
+import threading
+import sys
+
+from noise_xk.session import NoiseXKSession
+from noise_xk.transport import P2PTransport
+from dissononce.dh.x25519.public import PublicKey
+
+def main():
+    parser = argparse.ArgumentParser(prog="noise_xk")
+    parser.add_argument(
+        "--listen-port", type=int, required=True,
+        help="Port on which to bind+listen"
+    )
+    parser.add_argument(
+        "--peer-host", type=str, default="127.0.0.1",
+        help="Peer host to dial (default: 127.0.0.1)"
+    )
+    parser.add_argument(
+        "--peer-port", type=int, required=True,
+        help="Peer port to dial"
+    )
+    args = parser.parse_args()
+
+    # 1. Generate static keypair and print our static public key
+    kp = NoiseXKSession.generate_keypair()
+    # kp.public is a PublicKey; .data holds raw bytes
+    local_priv = kp.private     # carried implicitly in NoiseXKSession
+    local_pub = kp.public
+    print(f"[My static pubkey:] {local_pub.data.hex()}")
+
+    # 2. Read peer pubkey from user input
+    peer_pubkey = None
+    while True:
+        line = input(">>> ").strip()
+        if line.startswith("peer_pubkey "):
+            hexstr = line.split(None, 1)[1]
+            try:
+                raw = bytes.fromhex(hexstr)
+                peer_pubkey = PublicKey(raw)  # wrap raw bytes in PublicKey
+                break
+            except ValueError:
+                print("Invalid hex; please retry.")
+        else:
+            print("Use: peer_pubkey <hex>")
+
+    # 3. Establish P2P connection (race listen vs. dial)
+    transport = P2PTransport(
+        listen_port=args.listen_port,
+        peer_host=args.peer_host,
+        peer_port=args.peer_port
+    )
+    print(
+        f"Racing connect/listen on ports "
+        f"{args.listen_port} ⇆ {args.peer_host}:{args.peer_port}…"
+    )
+    sock, initiator = transport.connect()
+    print(f"Connected (initiator={initiator}); performing handshake…")
+
+    # 4. Perform Noise XK handshake
+    session = NoiseXKSession(kp, peer_pubkey)
+    session.handshake(sock, initiator)
+    print("Handshake complete! You can now type messages.")
+
+    # 5. Reader thread for incoming messages
+    def reader():
+        while True:
+            try:
+                pt = session.receive(sock)
+                print(f"\n< {pt.decode()}")
+            except Exception as e:
+                print(f"\n[Receive error ({type(e).__name__}): {e!r}]")
+                break
+
+    thread = threading.Thread(target=reader, daemon=True)
+    thread.start()
+
+    # 6. Main loop: send user input
+    try:
+        for line in sys.stdin:
+            text = line.rstrip("\n")
+            if not text:
+                continue
+            session.send(sock, text.encode())
+    except KeyboardInterrupt:
+        pass
+    finally:
+        sock.close()
+
+if __name__ == "__main__":
+    main()

protocol_prototype/Prototype/noise_xk/session.py

@@ -0,0 +1,179 @@
+# noise_xk/session.py
+
+import socket
+import logging
+from dissononce.processing.impl.handshakestate import HandshakeState
+from dissononce.processing.impl.symmetricstate import SymmetricState
+from dissononce.processing.impl.cipherstate import CipherState
+from dissononce.processing.handshakepatterns.interactive.XK import XKHandshakePattern
+from dissononce.cipher.chachapoly import ChaChaPolyCipher
+from dissononce.dh.x25519.x25519 import X25519DH
+from dissononce.dh.keypair import KeyPair
+from dissononce.dh.x25519.public import PublicKey
+from dissononce.hash.sha256 import SHA256Hash
+
+# Configure root logger for debug output
+logging.basicConfig(level=logging.DEBUG, format="%(message)s")
+
+class NoiseXKSession:
+    @staticmethod
+    def generate_keypair() -> KeyPair:
+        """
+        Generate a static X25519 KeyPair.
+        Returns:
+            KeyPair object with .private and .public attributes.
+        """
+        return X25519DH().generate_keypair()
+
+    def __init__(self, local_kp: KeyPair, peer_pubkey: PublicKey):
+        """
+        Initialize with our KeyPair and the peer's PublicKey.
+        """
+        self.local_kp: KeyPair = local_kp
+        self.peer_pubkey: PublicKey = peer_pubkey
+
+        # Build the Noise handshake state (X25519 DH, ChaChaPoly cipher, SHA256 hash)
+        cipher = ChaChaPolyCipher()
+        dh = X25519DH()
+        hshash = SHA256Hash()
+        symmetric = SymmetricState(CipherState(cipher), hshash)
+        self._hs = HandshakeState(symmetric, dh)
+
+        self._send_cs = None  # type: CipherState
+        self._recv_cs = None
+
+    def handshake(self, sock: socket.socket, initiator: bool) -> None:
+        """
+        Perform the XK handshake over the socket. Branches on initiator/responder
+        so that each side reads or writes in the correct message order.
+        On completion, self._send_cs and self._recv_cs hold the two CipherStates.
+        """
+
+        logging.debug(f"[handshake] start (initiator={initiator})")
+        # initialize with our KeyPair and their PublicKey
+        if initiator:
+            # initiator knows peer’s static out-of-band
+            self._hs.initialize(
+                XKHandshakePattern(),
+                True,
+                b'',
+                s=self.local_kp,
+                rs=self.peer_pubkey
+            )
+        else:
+            logging.debug("[handshake] responder initializing without rs")
+            # responder must NOT supply rs here
+            self._hs.initialize(
+                XKHandshakePattern(),
+                False,
+                b'',
+                s=self.local_kp
+            )
+
+        cs_pair = None
+        if initiator:
+            # 1) -> e
+            buf1 = bytearray()
+            cs_pair = self._hs.write_message(b'', buf1)
+            logging.debug(f"[-> e] {buf1.hex()}")
+            self._send_all(sock, buf1)
+
+            # 2) <- e, es, s, ss
+            msg2 = self._recv_all(sock)
+            logging.debug(f"[<- msg2] {msg2.hex()}")
+            self._hs.read_message(msg2, bytearray())
+
+            # 3) -> se (final)
+            buf3 = bytearray()
+            cs_pair = self._hs.write_message(b'', buf3)
+            logging.debug(f"[-> se] {buf3.hex()}")
+            self._send_all(sock, buf3)
+        else:
+            # 1) <- e
+            msg1 = self._recv_all(sock)
+            logging.debug(f"[<- e] {msg1.hex()}")
+            self._hs.read_message(msg1, bytearray())
+
+            # 2) -> e, es, s, ss
+            buf2 = bytearray()
+            cs_pair = self._hs.write_message(b'', buf2)
+            logging.debug(f"[-> msg2] {buf2.hex()}")
+            self._send_all(sock, buf2)
+
+            # 3) <- se (final)
+            msg3 = self._recv_all(sock)
+            logging.debug(f"[<- se] {msg3.hex()}")
+            cs_pair = self._hs.read_message(msg3, bytearray())
+
+        # on the final step, we must get exactly two CipherStates
+        if not cs_pair or len(cs_pair) != 2:
+            raise RuntimeError("Handshake did not complete properly")
+        cs0, cs1 = cs_pair
+        # the library returns (cs_encrypt_for_initiator, cs_decrypt_for_initiator)
+        if initiator:
+            # initiator: cs0 encrypts, cs1 decrypts
+            self._send_cs, self._recv_cs = cs0, cs1
+        else:
+            # responder must swap
+            self._send_cs, self._recv_cs = cs1, cs0
+
+        # dump the raw symmetric keys & nonces (if available)
+        self._dump_cipherstate("HANDSHAKE→ SEND", self._send_cs)
+        self._dump_cipherstate("HANDSHAKE→ RECV", self._recv_cs)
+
+    def send(self, sock: socket.socket, plaintext: bytes) -> None:
+        """
+        Encrypt and send a message.
+        """
+        if self._send_cs is None:
+            raise RuntimeError("Handshake not complete")
+        ct = self._send_cs.encrypt_with_ad(b'', plaintext)
+        logging.debug(f"[ENCRYPT] {ct.hex()}")
+        self._dump_cipherstate("SEND→ after encrypt", self._send_cs)
+        self._send_all(sock, ct)
+
+    def receive(self, sock: socket.socket) -> bytes:
+        """
+        Receive and decrypt a message.
+        """
+        if self._recv_cs is None:
+            raise RuntimeError("Handshake not complete")
+        ct = self._recv_all(sock)
+        logging.debug(f"[CIPHERTEXT] {ct.hex()}")
+        self._dump_cipherstate("RECV→ before decrypt", self._recv_cs)
+        pt = self._recv_cs.decrypt_with_ad(b'', ct)
+        logging.debug(f"[DECRYPT] {pt!r}")
+        return pt
+
+    def _send_all(self, sock: socket.socket, data: bytes) -> None:
+        # Length-prefix (2 bytes big-endian) + data
+        length = len(data).to_bytes(2, 'big')
+        sock.sendall(length + data)
+
+    def _recv_all(self, sock: socket.socket) -> bytes:
+        # Read 2-byte length prefix, then the payload
+        hdr = self._read_exact(sock, 2)
+        length = int.from_bytes(hdr, 'big')
+        return self._read_exact(sock, length)
+
+    @staticmethod
+    def _read_exact(sock: socket.socket, n: int) -> bytes:
+        buf = bytearray()
+        while len(buf) < n:
+            chunk = sock.recv(n - len(buf))
+            if not chunk:
+                raise ConnectionError("Socket closed during read")
+            buf.extend(chunk)
+        return bytes(buf)
+
+    def _dump_cipherstate(self, label: str, cs: CipherState) -> None:
+        """
+        Print the symmetric key (cs._k) and nonce counter (cs._n) for inspection.
+        """
+        key = cs._key
+        nonce = getattr(cs, "_n", None)
+        if isinstance(key, (bytes, bytearray)):
+            key_hex = key.hex()
+        else:
+            key_hex = repr(key)
+        logging.debug(f"[{label}] key={key_hex}")