New setting to configure the default country phone prefix, used to se…

…arch (and find) contacts missing it

src/app/pages/settings/settings.page.html

@@ -36,6 +36,20 @@ <h4>General</h4>
       <ion-button slot="end" (click)="editDatetimeFormat()">Edit</ion-button>
     </ion-item>
 
+    <ion-item>
+      <ion-label class="phone-prefix-label">
+        <h2>Default country prefix</h2>
+        <p class="ion-text-wrap">The country prefix (i.e. +1 for USA) to be used with numbers missing it</p>
+      </ion-label>
+      <ion-input
+        [ngModel]="settings.defaultCountryPrefix"
+        (ngModelChange)="setDefaultCountryPrefix($event)"
+        class="phone-prefix ion-text-right"
+        type="tel"
+        maxlength="7"
+      />
+    </ion-item>
+
     <ion-item-divider>
       <h4>Recordings</h4>
     </ion-item-divider>

src/app/pages/settings/settings.page.scss

@@ -0,0 +1,7 @@
+.phone-prefix-label {
+  max-width: none;
+}
+
+.phone-prefix {
+  min-width: 4em;
+}

src/app/pages/settings/settings.page.ts

@@ -90,4 +90,19 @@ export class SettingsPage {
     this.editor.present();
   }
 
+  /**
+   * Set the default country prefix to settings
+   */
+  setDefaultCountryPrefix(prefix: string) {
+    prefix = prefix.trim();
+    if (prefix) {
+      if (!prefix.startsWith('+')) {
+        prefix = '+' + prefix;
+      }
+      if (/^\+\d*$/g.test(prefix)) {
+        this.settings.defaultCountryPrefix = prefix;
+      }
+    }
+  }
+
 }

src/app/services/contacts.service.ts

@@ -3,12 +3,14 @@ import { Injectable } from '@angular/core';
 import { ContactPayload, Contacts, PhoneType } from '@capacitor-community/contacts';
 import { PermissionState } from '@capacitor/core';
 import { MessageBoxService } from './message-box.service';
+import { SettingsService } from './settings.service';
 
 @Injectable()
 export class ContactsService {
 
   constructor(
-    private mbs: MessageBoxService
+    private mbs: MessageBoxService,
+    private settings: SettingsService,
   ) {}
 
   /**
@@ -20,7 +22,7 @@ export class ContactsService {
   }
 
   /**
-   * Cleanup the given phone number by keeping only "+" and digits
+   * Cleanup the given phone number by keeping only "+" and digits.
    */
   cleanupPhoneNumber(phoneNumber: string): string {
     return phoneNumber.replace(/[^\d\+]/g, '');
@@ -42,13 +44,29 @@ export class ContactsService {
       }
     });
 
-    // find and return the first match
-    return res.contacts.find(item =>
-      item.phones?.filter(i => i.number)
-        .map(i => this.cleanupPhoneNumber(i.number!))
-        .includes(phoneNumber)
-    );
+    // find and return the first contact match
+    for (const contact of res.contacts) {
 
+      // get defined and cleaned contact numbers
+      const numbers = contact.phones?.filter(n => n).map(p => this.cleanupPhoneNumber(p!.number!));
+      if (numbers?.length) {
+
+        // search first the plain number...
+        for (const n of numbers) {
+          if (n === phoneNumber) return contact;
+        }
+
+        // ...then tries adding the default country prefix
+        // (special numbers could not have intl prefix)
+        if (this.settings.defaultCountryPrefix) {
+          for (const n of numbers) {
+            if (n[0] !== '+' && (this.settings.defaultCountryPrefix + n === phoneNumber)) return contact;
+          }
+        }
+      }
+    }
+
+    return undefined;
   }
 
   /**

src/app/services/settings.service.ts

@@ -58,6 +58,12 @@ export class SettingsService {
   @JsonProperty()
   public seekTime: number = 10;
 
+  /**
+   * Default country phone prefix
+   */
+  @JsonProperty()
+  public defaultCountryPrefix: string = '';
+
   /**
    * Custom filename format
    */