diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/build.gradle | 6 | ||||
| -rw-r--r-- | app/src/main/java/se/leap/bitmaskclient/base/fragments/EipFragment.java | 9 | ||||
| -rw-r--r-- | app/src/normal/assets/urls/riseup.net.url | 4 |
3 files changed, 13 insertions, 6 deletions
diff --git a/app/build.gradle b/app/build.gradle index 214ee205..e7d99127 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/main/java/se/leap/bitmaskclient/base/fragments/EipFragment.java b/app/src/main/java/se/leap/bitmaskclient/base/fragments/EipFragment.java index 409efcf0..a2fb2683 100644 --- a/app/src/main/java/se/leap/bitmaskclient/base/fragments/EipFragment.java +++ b/app/src/main/java/se/leap/bitmaskclient/base/fragments/EipFragment.java @@ -227,6 +227,12 @@ public class EipFragment extends Fragment implements Observer { public void onPause() { super.onPause(); Log.d(TAG, "onPause"); + if (stateView.getDrawable() instanceof Animatable) { + Animatable animatedDrawable = (Animatable) stateView.getDrawable(); + if (animatedDrawable.isRunning()) { + animatedDrawable.stop(); + } + } } @Override @@ -575,6 +581,9 @@ public class EipFragment extends Fragment implements Observer { @Override public void onAnimationEnd(Drawable drawable) { super.onAnimationEnd(drawable); + if (!isResumed()) { + return; + } if (pendingAnimationState != 0) { int newAnimationRes = pendingAnimationState; pendingAnimationState = 0; diff --git a/app/src/normal/assets/urls/riseup.net.url b/app/src/normal/assets/urls/riseup.net.url index ad24ee99..474580da 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" } |