emergency-call-types: Add emergency numbers from service provider db
This scales better than using a built in array. Closes: https://gitlab.gnome.org/GNOME/calls/-/issues/714 Signed-off-by: Guido Günther <agx@sigxcpu.org> Part-of: <https://gitlab.gnome.org/GNOME/calls/-/merge_requests/790>
This commit is contained in:
@@ -9,6 +9,7 @@
|
|||||||
#define G_LOG_DOMAIN "CallsEmergencyCallType"
|
#define G_LOG_DOMAIN "CallsEmergencyCallType"
|
||||||
|
|
||||||
#include "calls-emergency-call-types.h"
|
#include "calls-emergency-call-types.h"
|
||||||
|
#include "calls-service-providers.h"
|
||||||
|
|
||||||
#include <glib/gi18n.h>
|
#include <glib/gi18n.h>
|
||||||
|
|
||||||
@@ -280,17 +281,29 @@ calls_emergency_call_country_data_new (const char *country)
|
|||||||
|
|
||||||
|
|
||||||
void
|
void
|
||||||
calls_emergency_call_types_init (void)
|
calls_emergency_call_types_init (const char *dbfilename)
|
||||||
{
|
{
|
||||||
if (g_once_init_enter (&by_mcc)) {
|
if (g_once_init_enter (&by_mcc)) {
|
||||||
GHashTable *table = g_hash_table_new_full (g_str_hash,
|
g_autoptr (GError) err = NULL;
|
||||||
g_str_equal,
|
GHashTable *table = NULL;
|
||||||
NULL,
|
|
||||||
(GDestroyNotify) calls_emergency_call_country_data_free);
|
table = calls_service_providers_get_emergency_info_sync (dbfilename, &err);
|
||||||
|
if (!table) {
|
||||||
|
g_warning ("Failed to load emergency number database: '%s'", err->message);
|
||||||
|
table = g_hash_table_new_full (g_str_hash,
|
||||||
|
g_str_equal,
|
||||||
|
NULL,
|
||||||
|
(GDestroyNotify) calls_emergency_call_country_data_free);
|
||||||
|
}
|
||||||
|
|
||||||
for (int i = 0; i < G_N_ELEMENTS (emergency_number_types); i++) {
|
for (int i = 0; i < G_N_ELEMENTS (emergency_number_types); i++) {
|
||||||
CallsEmergencyCallCountryData *country;
|
CallsEmergencyCallCountryData *country;
|
||||||
|
const char *country_code = emergency_number_types[i].country_code;
|
||||||
|
|
||||||
|
if (g_hash_table_lookup (table, country_code))
|
||||||
|
continue;
|
||||||
|
|
||||||
|
/* Add a built in fallback */
|
||||||
country = calls_emergency_call_country_data_new (emergency_number_types[i].country_code);
|
country = calls_emergency_call_country_data_new (emergency_number_types[i].country_code);
|
||||||
for (int k = 0; k < G_N_ELEMENTS (emergency_number_types[i].numbers); k++) {
|
for (int k = 0; k < G_N_ELEMENTS (emergency_number_types[i].numbers); k++) {
|
||||||
CallsEmergencyNumber *number;
|
CallsEmergencyNumber *number;
|
||||||
|
|||||||
@@ -50,7 +50,7 @@ typedef struct {
|
|||||||
CallsEmergencyCallCountryData *calls_emergency_call_country_data_new (const char *country);
|
CallsEmergencyCallCountryData *calls_emergency_call_country_data_new (const char *country);
|
||||||
void calls_emergency_call_country_data_free (CallsEmergencyCallCountryData *country_data);
|
void calls_emergency_call_country_data_free (CallsEmergencyCallCountryData *country_data);
|
||||||
|
|
||||||
void calls_emergency_call_types_init (void);
|
void calls_emergency_call_types_init (const char *dbfilename);
|
||||||
void calls_emergency_call_types_destroy (void);
|
void calls_emergency_call_types_destroy (void);
|
||||||
char *calls_emergency_call_type_get_name (const char *number, const char *country_code);
|
char *calls_emergency_call_type_get_name (const char *number, const char *country_code);
|
||||||
GStrv calls_emergency_call_types_get_numbers_by_country_code (const char *country_code);
|
GStrv calls_emergency_call_types_get_numbers_by_country_code (const char *country_code);
|
||||||
|
|||||||
@@ -8,6 +8,8 @@
|
|||||||
|
|
||||||
#define G_LOG_DOMAIN "CallsEmergencyCallsManager"
|
#define G_LOG_DOMAIN "CallsEmergencyCallsManager"
|
||||||
|
|
||||||
|
#include "calls-config.h"
|
||||||
|
|
||||||
#include "calls-emergency-calls-manager.h"
|
#include "calls-emergency-calls-manager.h"
|
||||||
#include "calls-emergency-call-types.h"
|
#include "calls-emergency-call-types.h"
|
||||||
#include "calls-origin.h"
|
#include "calls-origin.h"
|
||||||
@@ -231,7 +233,7 @@ calls_emergency_calls_manager_init (CallsEmergencyCallsManager *self)
|
|||||||
{
|
{
|
||||||
CallsManager *manager = calls_manager_get_default ();
|
CallsManager *manager = calls_manager_get_default ();
|
||||||
|
|
||||||
calls_emergency_call_types_init ();
|
calls_emergency_call_types_init (CALLS_EMERGENCY_INFO_DATABASE);
|
||||||
|
|
||||||
self->origins = g_object_ref (calls_manager_get_origins (manager));
|
self->origins = g_object_ref (calls_manager_get_origins (manager));
|
||||||
g_signal_connect_object (self->origins,
|
g_signal_connect_object (self->origins,
|
||||||
|
|||||||
@@ -40,6 +40,11 @@ test_lookup (void)
|
|||||||
/* Numbers that doesn't match */
|
/* Numbers that doesn't match */
|
||||||
lookup = calls_emergency_call_type_get_name ("123456", "DE");
|
lookup = calls_emergency_call_type_get_name ("123456", "DE");
|
||||||
g_assert_null (lookup);
|
g_assert_null (lookup);
|
||||||
|
|
||||||
|
/* Lookup from service provider db */
|
||||||
|
lookup = calls_emergency_call_type_get_name ("112", "yy");
|
||||||
|
g_assert_cmpstr (lookup, ==, "Police, Ambulance, Fire Brigade");
|
||||||
|
g_free (lookup);
|
||||||
}
|
}
|
||||||
|
|
||||||
int
|
int
|
||||||
@@ -49,7 +54,7 @@ main (int argc,
|
|||||||
gint ret;
|
gint ret;
|
||||||
g_test_init (&argc, &argv, NULL);
|
g_test_init (&argc, &argv, NULL);
|
||||||
|
|
||||||
calls_emergency_call_types_init ();
|
calls_emergency_call_types_init (TEST_DATABASE);
|
||||||
|
|
||||||
g_test_add_func ("/Calls/EmergencyCallTypes/lookup", test_lookup);
|
g_test_add_func ("/Calls/EmergencyCallTypes/lookup", test_lookup);
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user