From 951dc55f6051e4896a77ad2d48b89b2b1fd4e06f Mon Sep 17 00:00:00 2001
From: Juha Heinanen <jh@tutpro.com>
Date: Mon, 19 Jan 2026 05:20:04 +0200
Subject: [PATCH] Added BaresipApp to avoid baresip service starting before
 baresip library is loaded

---
 app/src/main/AndroidManifest.xml                  |  1 +
 .../main/kotlin/com/tutpro/baresip/BaresipApp.kt  | 15 +++++++++++++++
 .../kotlin/com/tutpro/baresip/BaresipService.kt   |  2 +-
 .../kotlin/com/tutpro/baresip/MainActivity.kt     | 10 +---------
 4 files changed, 18 insertions(+), 10 deletions(-)
 create mode 100644 app/src/main/kotlin/com/tutpro/baresip/BaresipApp.kt

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 89ccf67c..2bea82a0 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -40,6 +40,7 @@
         android:required="false" />
 
     <application
+        android:name=".BaresipApp"
         android:icon="@mipmap/ic_launcher"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:installLocation="internalOnly"
diff --git a/app/src/main/kotlin/com/tutpro/baresip/BaresipApp.kt b/app/src/main/kotlin/com/tutpro/baresip/BaresipApp.kt
new file mode 100644
index 00000000..b5062e2e
--- /dev/null
+++ b/app/src/main/kotlin/com/tutpro/baresip/BaresipApp.kt
@@ -0,0 +1,15 @@
+package com.tutpro.baresip
+
+import android.app.Application
+
+class BaresipApp : Application() {
+
+    override fun onCreate() {
+        super.onCreate()
+        if (!BaresipService.libraryLoaded) {
+            Log.i(TAG, "Loading baresip library")
+            System.loadLibrary("baresip")
+            BaresipService.libraryLoaded = true
+        }
+    }
+}
diff --git a/app/src/main/kotlin/com/tutpro/baresip/BaresipService.kt b/app/src/main/kotlin/com/tutpro/baresip/BaresipService.kt
index 41e39cd5..f659bb99 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/BaresipService.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/BaresipService.kt
@@ -124,7 +124,7 @@ class BaresipService: Service() {
     override fun onCreate() {
         super.onCreate()
 
-        Log.d(TAG, "BaresipService onCreate")
+        Log.i(TAG, "BaresipService onCreate")
 
         intent = Intent("com.tutpro.baresip.EVENT")
         intent.setPackage("com.tutpro.baresip")
diff --git a/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt b/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt
index 798ac553..c626ee3f 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt
@@ -66,7 +66,7 @@ class MainActivity : ComponentActivity() {
         super.onCreate(savedInstanceState)
 
         val extraAction = intent.getStringExtra("action")
-        Log.e(TAG, "Main onCreate ${intent.action}/${intent.data}/$extraAction")
+        Log.i(TAG, "Main onCreate ${intent.action}/${intent.data}/$extraAction")
 
         window.addFlags(WindowManager.LayoutParams.FLAG_IGNORE_CHEEK_PRESSES)
 
@@ -409,12 +409,4 @@ class MainActivity : ComponentActivity() {
         exitProcess(0)
     }
 
-    init {
-        if (!BaresipService.libraryLoaded) {
-            Log.d(TAG, "Loading baresip library")
-            System.loadLibrary("baresip")
-            BaresipService.libraryLoaded = true
-        }
-    }
-
 }