From 31ed7903783429ac15a25e2d976138f263c10c29 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Fri, 27 Nov 2020 15:41:32 +0100
Subject: [PATCH] Fixed tel URI handling when number starts with +

---
 .../java/org/linphone/activities/main/MainActivity.kt     | 8 +++++---
 build.gradle                                              | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/org/linphone/activities/main/MainActivity.kt b/app/src/main/java/org/linphone/activities/main/MainActivity.kt
index 5fb4b67c9..a017c5302 100644
--- a/app/src/main/java/org/linphone/activities/main/MainActivity.kt
+++ b/app/src/main/java/org/linphone/activities/main/MainActivity.kt
@@ -248,15 +248,17 @@ class MainActivity : GenericActivity(), SnackBarActivity, NavController.OnDestin
         Log.i("[Main Activity] Found uri: $uri to call")
         val stringUri = uri.toString()
         var addressToCall: String = stringUri
-        try {
-            addressToCall = URLDecoder.decode(stringUri, "UTF-8")
-        } catch (e: UnsupportedEncodingException) { }
 
         if (addressToCall.startsWith("tel:")) {
             Log.i("[Main Activity] Removing tel: prefix")
             addressToCall = addressToCall.substring("tel:".length)
         }
 
+        val address = coreContext.core.interpretUrl(addressToCall)
+        if (address != null) {
+            addressToCall = address.asStringUriOnly()
+        }
+
         Log.i("[Main Activity] Starting dialer with pre-filled URI $addressToCall")
         val args = Bundle()
         args.putString("URI", addressToCall)
diff --git a/build.gradle b/build.gradle
index 0a568ff8a..5686a006c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.4.10'
+    ext.kotlin_version = '1.4.20'
 
     repositories {
         google()