OT-577 Unable to call contact (#342)

* OT-577 Unable to call contact
coi-dev · Dec 11, 2019 · bd46cd8 · bd46cd8
1 parent 46d9f64
commit bd46cd8
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 5 deletions.
diff --git a/lib/src/chat/chat.dart b/lib/src/chat/chat.dart
@@ -79,6 +79,7 @@ import 'package:ox_coi/src/ui/strings.dart';
 import 'package:ox_coi/src/utils/dialog_builder.dart';
 import 'package:ox_coi/src/utils/keyMapping.dart';
 import 'package:ox_coi/src/utils/key_generator.dart';
+import 'package:ox_coi/src/utils/text.dart';
 import 'package:ox_coi/src/utils/toast.dart';
 import 'package:ox_coi/src/widgets/avatar.dart';
 import 'package:ox_coi/src/widgets/state_info.dart';
@@ -741,7 +742,10 @@ class _ChatState extends State<Chat> with ChatComposer, ChatCreateMixin, InviteM
     }
   }
 
-  Future<bool> callNumber(String phoneNumber) => launch("tel://$phoneNumber");
+  void callNumber(String phoneNumber) {
+    String parsedPhoneNumber = getPhoneNumberFromString(phoneNumber);
+    launch("tel://$parsedPhoneNumber");
+  }
 }
 
 class MessageList extends StatelessWidget {

diff --git a/lib/src/utils/text.dart b/lib/src/utils/text.dart
@@ -42,13 +42,15 @@
 
 import 'dart:convert';
 
+final RegExp matchInvertedNumericAndPlus = RegExp(r'[^0-9+]');
+
+final RegExp matchEmail = RegExp(
+    r'^(([^<>()[\]\\.,;:\s@\"]+(\.[^<>()[\]\\.,;:\s@\"]+)*)|(\".+\"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$');
+
 isNullOrEmpty(String text) => text == null || text.isEmpty;
 
 bool isEmail(String email) {
-  String source =
-      r'^(([^<>()[\]\\.,;:\s@\"]+(\.[^<>()[\]\\.,;:\s@\"]+)*)|(\".+\"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$';
-  RegExp regExp = new RegExp(source);
-  return regExp.hasMatch(email);
+  return matchEmail.hasMatch(email);
 }
 
 bool isPort(String portString) {
@@ -74,3 +76,8 @@ String encodeBase64(String text) {
 int getIndexAfterLastOf(String text, Pattern pattern) {
   return text.lastIndexOf(pattern) + 1;
 }
+
+String getPhoneNumberFromString(String text) {
+  String phoneNumberWithoutOptionals = text.replaceFirst("(0)", '');
+  return phoneNumberWithoutOptionals.replaceAll(matchInvertedNumericAndPlus, '');
+}