diff --git a/app/lib/services/phone_service.dart b/app/lib/services/phone_service.dart index 80e93e5a8..07d0f3bf9 100644 --- a/app/lib/services/phone_service.dart +++ b/app/lib/services/phone_service.dart @@ -1,11 +1,12 @@ +import 'dart:convert'; + import 'package:http/http.dart' as http; -import 'package:http/http.dart'; import 'package:threebotlogin/helpers/logger.dart'; -// https://api.ipgeolocationapi.com/geolocate -Future getCountry() async { - Uri url = Uri.parse('https://ipinfo.io/country'); +Future getCountry() async { + Uri url = Uri.parse('https://geoip.grid.tf/'); logger.i('Sending call: ${url.toString()}'); - - return await http.get(url); + final res = await http.get(url); + final data = jsonDecode(res.body); + return data['country_code']; } diff --git a/app/lib/widgets/phone_widget.dart b/app/lib/widgets/phone_widget.dart index 913a6f381..d10395e0d 100644 --- a/app/lib/widgets/phone_widget.dart +++ b/app/lib/widgets/phone_widget.dart @@ -2,7 +2,6 @@ import 'dart:convert'; import 'package:flutter/material.dart'; import 'package:flutter_pkid/flutter_pkid.dart'; -import 'package:http/http.dart'; import 'package:intl_mobile_field/countries.dart'; import 'package:intl_mobile_field/intl_mobile_field.dart'; import 'package:threebotlogin/helpers/globals.dart'; @@ -15,8 +14,7 @@ import 'custom_dialog.dart'; Future addPhoneNumberDialog(context, {required bool newPhone, required String oldPhone}) async { - Response res = await getCountry(); - var countryCode = res.body.replaceAll('\n', ''); + final countryCode = await getCountry(); await showDialog( context: context, @@ -167,7 +165,7 @@ class PhoneAlertDialogState extends State { ]); } - Future wantToVerifyNow() async { + Future verifyNow() async { return await showDialog( context: context, barrierDismissible: false, @@ -204,7 +202,7 @@ class PhoneAlertDialogState extends State { FlutterPkid client = await getPkidClient(); client.setPKidDoc('phone', json.encode({'phone': verificationPhoneNumber})); - wantToVerifyNow(); + verifyNow(); } sendPhoneVerification() async {