From dc84c01adb7244bcf24d56db5eb73d2ce22970fb Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Sun, 1 Jan 2023 21:12:01 +0100
Subject: [PATCH] remove hard-coded IP's for riseup api for now, switch menshen
 URL

---
 app/build.gradle                          | 6 +++---
 app/src/normal/assets/urls/riseup.net.url | 4 +---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 92120f880..a216b0418 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -131,12 +131,12 @@ android {
       def customProviderUrl = '"https://black.riseup.net"'
       buildConfigField "String", "customProviderUrl", customProviderUrl
       //static ip address of provider, using a commercially validated CA certificate to serve the provider.json
-      def customProviderIp = '"198.252.153.70"'
+      def customProviderIp = '""'
       buildConfigField "String", "customProviderIp", customProviderIp
       //static ip address of the provider api, using a self signed certificate to serve provider.json, eip-service.json etc.
-      def customProviderApiIp = '"198.252.153.107"'
+      def customProviderApiIp = '""'
       buildConfigField "String", "customProviderApiIp", customProviderApiIp
-      def geoipUrl = '"https://api.black.riseup.net:9001/json"'
+      def geoipUrl = '"https://menshen.riseup.net/json"'
       buildConfigField "String", "geoipUrl", geoipUrl
       //URL for the message of the day, see https://0xacab.org/leap/motd#motd-message-of-the-day
       def customProviderMotdUrl = '"https://static.riseup.net/vpn/motd.json"'
diff --git a/app/src/normal/assets/urls/riseup.net.url b/app/src/normal/assets/urls/riseup.net.url
index ad24ee994..474580daa 100644
--- a/app/src/normal/assets/urls/riseup.net.url
+++ b/app/src/normal/assets/urls/riseup.net.url
@@ -1,7 +1,5 @@
 {
 	"main_url" : "https://black.riseup.net",
-	"provider_ip" : "198.252.153.70",
-	"provider_api_ip" : "198.252.153.107",
-	"geoip_url" : "https://api.black.riseup.net:9001/json",
+	"geoip_url" : "https://menshen.riseup.net/json",
 	"motd_url": "https://static.riseup.net/vpn/motd.json"
 }
-- 
GitLab