Added ipinfo/region

pull/209/head
M66B 2 years ago
parent 74e671fa37
commit 58e883869b

@ -397,7 +397,8 @@ public class FragmentDialogOpenLink extends FragmentDialogBase {
@Override @Override
protected void onExecuted(Bundle args, Pair<InetAddress, IPInfo> data) { protected void onExecuted(Bundle args, Pair<InetAddress, IPInfo> data) {
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
for (String value : new String[]{data.second.org, data.second.city, data.second.country}) IPInfo ipinfo = data.second;
for (String value : new String[]{ipinfo.org, ipinfo.city, ipinfo.region, ipinfo.country})
if (!TextUtils.isEmpty(value)) { if (!TextUtils.isEmpty(value)) {
if (sb.length() != 0) if (sb.length() != 0)
sb.append("; "); sb.append("; ");

@ -43,6 +43,7 @@ import javax.net.ssl.HttpsURLConnection;
public class IPInfo { public class IPInfo {
public String org; public String org;
public String city; public String city;
public String region;
public String country; public String country;
private static final Map<InetAddress, IPInfo> addressOrganization = new HashMap<>(); private static final Map<InetAddress, IPInfo> addressOrganization = new HashMap<>();
@ -105,6 +106,7 @@ public class IPInfo {
JSONObject jroot = new JSONObject(response); JSONObject jroot = new JSONObject(response);
info.org = jroot.optString("org"); info.org = jroot.optString("org");
info.city = jroot.optString("city"); info.city = jroot.optString("city");
info.region = jroot.optString("region");
info.country = jroot.optString("country"); info.country = jroot.optString("country");
} finally { } finally {
connection.disconnect(); connection.disconnect();

Loading…
Cancel
Save