From 72b25238a51f5dba6a7a8fd769e0c233ef5da1cb Mon Sep 17 00:00:00 2001
From: Pascal Merle <pm@i-p-tel.com>
Date: Mon, 1 Jul 2024 15:40:40 +0200
Subject: [PATCH] 6.5     * Android 14 compatibility     * Rejects incoming SIP
 calls during ongoing PSTN call

---
 app/build.gradle                                      | 3 ++-
 app/src/main/AndroidManifest.xml                      | 9 +++++----
 app/src/main/java/org/sipdroid/codecs/Codecs.java     | 2 +-
 app/src/main/java/org/sipdroid/sipua/UserAgent.java   | 3 ++-
 app/src/main/java/org/sipdroid/sipua/ui/Receiver.java | 2 --
 app/src/main/java/org/sipdroid/sipua/ui/Sipdroid.java | 2 ++
 app/src/main/java/org/zoolu/net/TcpSocket.java        | 2 +-
 app/src/main/jni/Application.mk                       | 4 ++--
 app/src/main/res/values/strings.xml                   | 2 +-
 build.gradle                                          | 2 +-
 gradle.properties                                     | 3 +++
 11 files changed, 20 insertions(+), 14 deletions(-)
 create mode 100644 gradle.properties

diff --git a/app/build.gradle b/app/build.gradle
index bf45d4d..01f6a0f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -7,7 +7,7 @@ android {
     defaultConfig {
         applicationId "org.sipdroid.sipua"
         minSdkVersion 16
-        targetSdkVersion 31
+        targetSdkVersion 33
     }
 
     buildTypes {
@@ -28,4 +28,5 @@ android {
             path 'src/main/jni/Android.mk'
         }
     }
+    namespace 'org.sipdroid.sipua'
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index cf66815..14062a0 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -24,11 +24,10 @@
 /////////////////////////////////////////////////////////////////////
  -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-	package="org.sipdroid.sipua"
-    android:versionName="6.3 beta"
-    android:versionCode="136"
+	android:versionName="6.5"
+    android:versionCode="146"
     android:installLocation="auto">
-	<uses-sdk android:minSdkVersion="16" android:targetSdkVersion="31"/>
+	<uses-sdk android:minSdkVersion="16" android:targetSdkVersion="33"/>
 	<supports-screens
           android:normalScreens="true"
           android:smallScreens="true"
@@ -159,7 +158,9 @@
 	<uses-permission android:name="android.permission.FOREGROUND_SERVICE"></uses-permission>
 	<uses-permission android:name="android.permission.USE_FULL_SCREEN_INTENT"></uses-permission>
 	<uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM"></uses-permission>
+	<uses-permission android:name="android.permission.USE_EXACT_ALARM"></uses-permission>
 	<uses-permission android:name="android.permission.BLUETOOTH_CONNECT"></uses-permission>
+	<uses-permission android:name="android.permission.POST_NOTIFICATIONS"></uses-permission>
 <!-- 
 	<permission android:name="org.sipdroid.sipua.permission.C2D_MESSAGE" android:protectionLevel="signature" />
 	<uses-permission android:name="org.sipdroid.sipua.permission.C2D_MESSAGE" />
diff --git a/app/src/main/java/org/sipdroid/codecs/Codecs.java b/app/src/main/java/org/sipdroid/codecs/Codecs.java
index 39ea6f2..ea2eee3 100644
--- a/app/src/main/java/org/sipdroid/codecs/Codecs.java
+++ b/app/src/main/java/org/sipdroid/codecs/Codecs.java
@@ -55,7 +55,7 @@ public class Codecs {
 			add(new alaw());
 			add(new ulaw());
 			add(new Speex());
-			add(new GSM());
+//			add(new GSM());			due to a bug in clang this can't be compiled since 12/2023
 			add(new BV16());
 		}};
 	private static final HashMap<Integer, Codec> codecsNumbers;
diff --git a/app/src/main/java/org/sipdroid/sipua/UserAgent.java b/app/src/main/java/org/sipdroid/sipua/UserAgent.java
index 79743d6..946c91e 100644
--- a/app/src/main/java/org/sipdroid/sipua/UserAgent.java
+++ b/app/src/main/java/org/sipdroid/sipua/UserAgent.java
@@ -549,7 +549,8 @@ public void onCallIncoming(Call call, NameAddress callee,
 			if (ua == this) break;
 			i++;
 		}
-		if (Receiver.call_state != UA_STATE_IDLE || !Receiver.isFast(i)) {
+		if (Receiver.call_state != UA_STATE_IDLE || (Receiver.pstn_state != null &&
+				!Receiver.pstn_state.equals("IDLE")) || !Receiver.isFast(i)) {
 			call.busy();
 			listen();
 			return;
diff --git a/app/src/main/java/org/sipdroid/sipua/ui/Receiver.java b/app/src/main/java/org/sipdroid/sipua/ui/Receiver.java
index 5382a58..b74b816 100644
--- a/app/src/main/java/org/sipdroid/sipua/ui/Receiver.java
+++ b/app/src/main/java/org/sipdroid/sipua/ui/Receiver.java
@@ -424,10 +424,8 @@ public static void onText(int type,String text,int mInCallResId,long base) {
 				else if (type >= REGISTER_NOTIFICATION)
 					type = alloc(type);
 		    	if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O && Receiver.sContext != null && type == REGISTER_NOTIFICATION) {
-					System.out.println("startForeground "+type);
 					Receiver.sContext.startForeground(type, notification);
 				} else {
-					System.out.println("notify " + type);
 					mNotificationMgr.notify(type, notification);
 				}
 	        } else {
diff --git a/app/src/main/java/org/sipdroid/sipua/ui/Sipdroid.java b/app/src/main/java/org/sipdroid/sipua/ui/Sipdroid.java
index fae318b..657bdbe 100644
--- a/app/src/main/java/org/sipdroid/sipua/ui/Sipdroid.java
+++ b/app/src/main/java/org/sipdroid/sipua/ui/Sipdroid.java
@@ -99,6 +99,8 @@ public void onStart() {
 				Manifest.permission.WRITE_CONTACTS,
 				Manifest.permission.WRITE_CALL_LOG,
 				Manifest.permission.RECORD_AUDIO,
+				Manifest.permission.READ_PHONE_STATE,
+				Manifest.permission.POST_NOTIFICATIONS,
 				null
 				};
 			if (Integer.parseInt(Build.VERSION.SDK) >= 31)
diff --git a/app/src/main/java/org/zoolu/net/TcpSocket.java b/app/src/main/java/org/zoolu/net/TcpSocket.java
index 038ecce..a040eaf 100644
--- a/app/src/main/java/org/zoolu/net/TcpSocket.java
+++ b/app/src/main/java/org/zoolu/net/TcpSocket.java
@@ -59,7 +59,7 @@ public class TcpSocket {
 	/** Creates a new UdpSocket */
 	public TcpSocket(IpAddress ipaddr, int port, String host) throws java.io.IOException {
 //		socket = new Socket(ipaddr.getInetAddress(), port); modified
-		SSLSocketFactory f = 
+		SSLSocketFactory f =
 	         (SSLSocketFactory) SSLSocketFactory.getSocketFactory();
 		if (host == null)
 			socket = new Socket();
diff --git a/app/src/main/jni/Application.mk b/app/src/main/jni/Application.mk
index 4796bfc..a4fcb5c 100644
--- a/app/src/main/jni/Application.mk
+++ b/app/src/main/jni/Application.mk
@@ -7,9 +7,9 @@ APP_MODULES	 += silkcommon
 #APP_MODULES	 += silk16_jni
 #APP_MODULES	 += silk24_jni
 APP_MODULES	 += g722_jni
-APP_MODULES	 += gsm_jni
+#APP_MODULES	 += gsm_jni
 
 APP_OPTIM        := release 
 APP_CFLAGS       += -O3
-APP_ABI			 := armeabi-v7a arm64-v8a
+APP_ABI			 := arm64-v8a armeabi-v7a
 APP_PLATFORM     := android-11
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 5a3d9d5..b3c8502 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -49,7 +49,7 @@
 
 <string name="permhelp">Sipdroid never stores or transfers any personal data, such as call logs or phone numbers. Please allow access to:
 \n\nTelephone: If you deny, Sipdroid will not be able to proxy calls made through the OS dialer to Voice-over-IP.
-\n\nContacts: For displaying their names in Sipdroid\'s call screen.
+\n\nContact list: For displaying contact names in Sipdroid\'s call screen.
 \n\nMicrophone: If you deny, calls will be unidirectional. The other party won\'t hear you.</string>
 <string name="reg">Registering...</string>
 <string name="regpref">Preferred</string>
diff --git a/build.gradle b/build.gradle
index 4939a16..052dbbe 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.3.1'
+        classpath 'com.android.tools.build:gradle:8.2.0'
     }
 }
 
diff --git a/gradle.properties b/gradle.properties
new file mode 100644
index 0000000..f82049a
--- /dev/null
+++ b/gradle.properties
@@ -0,0 +1,3 @@
+android.defaults.buildfeatures.buildconfig=true
+android.nonFinalResIds=false
+android.nonTransitiveRClass=false
\ No newline at end of file