Skip to content

Fix get Country #918

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zaelgohary merged 3 commits into from
Feb 13, 2025
Merged

Fix get Country #918

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2ac2e02
Rename verifyNow method, use diff ip API
zaelgohary Feb 12, 2025
2a5b8ab
Change return type
zaelgohary Feb 12, 2025
86f9493
Change IP API
zaelgohary Feb 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions app/lib/services/phone_service.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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<Response> getCountry() async {
Uri url = Uri.parse('https://ipinfo.io/country');
Future<String> 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'];
}
8 changes: 3 additions & 5 deletions app/lib/widgets/phone_widget.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand All @@ -15,8 +14,7 @@ import 'custom_dialog.dart';

Future<void> 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,
Expand Down Expand Up @@ -167,7 +165,7 @@ class PhoneAlertDialogState extends State<PhoneAlertDialog> {
]);
}

Future<dynamic> wantToVerifyNow() async {
Future<dynamic> verifyNow() async {
return await showDialog(
context: context,
barrierDismissible: false,
Expand Down Expand Up @@ -204,7 +202,7 @@ class PhoneAlertDialogState extends State<PhoneAlertDialog> {
FlutterPkid client = await getPkidClient();
client.setPKidDoc('phone', json.encode({'phone': verificationPhoneNumber}));

wantToVerifyNow();
verifyNow();
}

sendPhoneVerification() async {
Expand Down