From c3281011172693224d271f94c97ed2abaf33bc05 Mon Sep 17 00:00:00 2001 From: Metin Akat Date: Thu, 21 Mar 2019 17:35:08 +0200 Subject: [PATCH] Fix libphonenumber starting and usage --- apps/roster/src/roster.app.src | 2 +- apps/roster/src/roster.erl | 1 - apps/roster/src/roster_db.erl | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/apps/roster/src/roster.app.src b/apps/roster/src/roster.app.src index cbd238a71..f8d040ed4 100644 --- a/apps/roster/src/roster.app.src +++ b/apps/roster/src/roster.app.src @@ -2,6 +2,6 @@ [{description, "Roster Protocol"}, {vsn, "1"}, {registered, []}, - {applications, [kernel,stdlib,mnesia,kvs,emqttd,n2o,bpe,locus,prometheus]}, + {applications, [kernel,stdlib,mnesia,kvs,emqttd,n2o,bpe,locus,prometheus, libphonenumber_erlang]}, {mod, { roster, []}}, {env, []} ]}. diff --git a/apps/roster/src/roster.erl b/apps/roster/src/roster.erl index 46498d278..3ad97c231 100644 --- a/apps/roster/src/roster.erl +++ b/apps/roster/src/roster.erl @@ -72,7 +72,6 @@ start(_, _) -> atoms(), catch load([]), roster_history:start(), roster_push:start(), stickers_api:init_default_pack(), - application:start(libphonenumber_erlang), init_default_fake_numbers(), prometheus_api:init(), store_mnesia:sync_indexes(), A end catch E:Z -> diff --git a/apps/roster/src/roster_db.erl b/apps/roster/src/roster_db.erl index beac23ffd..e0a7dfd37 100644 --- a/apps/roster/src/roster_db.erl +++ b/apps/roster/src/roster_db.erl @@ -289,7 +289,7 @@ online_user_country(#'Roster'{phone = Phone} =Roster, Acc) -> _ -> Acc end. user_country(#'Roster'{phone = Phone}, Acc) -> - case phone_utils:mobile_phone_number_info(<<"+", Phone/binary>>) of + case libphonenumbers:mobile_phone_number_info(<<"+", Phone/binary>>) of #{country_metadata := #{id := Id}, valid := true} -> roster:inc_key(Id, Acc); _ -> Acc end. -- GitLab