From 04ae18c1ae82a24892333203735529b27d681a27 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Thu, 29 Sep 2022 11:15:43 +0200
Subject: [PATCH] Set media encryption to SRTP when connecting a
 sip.linphone.org account if media encryption setting is set to None + bumped
 version code

---
 app/build.gradle                                  | 15 +++------------
 .../main/java/org/linphone/core/CoreContext.kt    |  4 ++++
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index fe1eb36ed..5f2ed69da 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -6,9 +6,8 @@ plugins {
 }
 
 def appVersionName = "4.7.0"
-// Uncomment for 4.7.0 release
-// def appVersionCode = 40700 // 4.07.00
-def appVersionCode = 40694 // 4.06.94
+// def appVersionCode = 40700
+def appVersionCode = 40700
 
 static def getPackageName() {
     return "org.linphone"
@@ -191,14 +190,6 @@ android {
         dataBinding = true
     }
 
-    compileOptions {
-        //sourceCompatibility JavaVersion.VERSION_1_8
-        //targetCompatibility JavaVersion.VERSION_1_8
-    }
-
-    kotlinOptions {
-        //jvmTarget = "1.8"
-    }
     namespace 'org.linphone'
 }
 
@@ -219,7 +210,7 @@ dependencies {
     implementation "androidx.slidingpanelayout:slidingpanelayout:1.2.0"
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     implementation "androidx.gridlayout:gridlayout:1.0.0"
-    implementation 'androidx.recyclerview:recyclerview:1.3.0-beta02'
+    implementation 'androidx.recyclerview:recyclerview:1.3.0-rc01'
 
     // https://github.com/material-components/material-components-android/blob/master/LICENSE Apache v2.0
     implementation 'com.google.android.material:material:1.6.1'
diff --git a/app/src/main/java/org/linphone/core/CoreContext.kt b/app/src/main/java/org/linphone/core/CoreContext.kt
index be5d10467..9b6f7f86d 100644
--- a/app/src/main/java/org/linphone/core/CoreContext.kt
+++ b/app/src/main/java/org/linphone/core/CoreContext.kt
@@ -508,6 +508,10 @@ class CoreContext(
                     friendList.rlsAddress = rlsAddress
                 }
             }
+            if (core.mediaEncryption == MediaEncryption.None) {
+                Log.i("[Context] Enabling SRTP media encryption instead of None")
+                core.mediaEncryption = MediaEncryption.SRTP
+            }
         } else {
             Log.i("[Context] Background mode with foreground service automatically enabled")
             corePreferences.keepServiceAlive = true