From 36ced606f6886b074ac42761f672f30328917f6f Mon Sep 17 00:00:00 2001 From: cyBerta Date: Sat, 5 Feb 2022 04:35:29 +0100 Subject: avoid short animation when turning off the VPN --- app/src/main/java/se/leap/bitmaskclient/base/fragments/EipFragment.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app') 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 07057d6e..28879a71 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 @@ -515,7 +515,7 @@ public class EipFragment extends Fragment implements Observer { } private void showConnectionTransitionLayout(boolean isConnecting) { - mainButton.updateState(true, true, false); + mainButton.updateState(true, isConnecting, false); if (isConnecting) { colorBackgroundALittle(); } else { -- cgit v1.2.3 From 509ef8ccea4fe1260c6422642cce2525445b4625 Mon Sep 17 00:00:00 2001 From: cyBerta Date: Sat, 5 Feb 2022 04:37:52 +0100 Subject: improve gateway connection setup animation --- app/src/main/res/drawable/main_btn_glow.xml | 21 +++++++++------------ app/src/main/res/drawable/on_off_btn_an1.png | Bin 0 -> 16186 bytes app/src/main/res/drawable/on_off_btn_an2.png | Bin 0 -> 12771 bytes app/src/main/res/drawable/on_off_btn_an3.png | Bin 0 -> 10006 bytes app/src/main/res/drawable/on_off_btn_an4.png | Bin 0 -> 9308 bytes .../res/drawable/on_off_btn_start_animation1.png | Bin 32481 -> 0 bytes .../res/drawable/on_off_btn_start_animation2.png | Bin 36701 -> 0 bytes .../res/drawable/on_off_btn_start_animation3.png | Bin 39980 -> 0 bytes .../res/drawable/on_off_btn_start_animation4.png | Bin 41982 -> 0 bytes .../res/drawable/on_off_btn_start_animation5.png | Bin 43093 -> 0 bytes 10 files changed, 9 insertions(+), 12 deletions(-) create mode 100644 app/src/main/res/drawable/on_off_btn_an1.png create mode 100644 app/src/main/res/drawable/on_off_btn_an2.png create mode 100644 app/src/main/res/drawable/on_off_btn_an3.png create mode 100644 app/src/main/res/drawable/on_off_btn_an4.png delete mode 100644 app/src/main/res/drawable/on_off_btn_start_animation1.png delete mode 100644 app/src/main/res/drawable/on_off_btn_start_animation2.png delete mode 100644 app/src/main/res/drawable/on_off_btn_start_animation3.png delete mode 100644 app/src/main/res/drawable/on_off_btn_start_animation4.png delete mode 100644 app/src/main/res/drawable/on_off_btn_start_animation5.png (limited to 'app') diff --git a/app/src/main/res/drawable/main_btn_glow.xml b/app/src/main/res/drawable/main_btn_glow.xml index 76b2268a..5ed57dd5 100644 --- a/app/src/main/res/drawable/main_btn_glow.xml +++ b/app/src/main/res/drawable/main_btn_glow.xml @@ -1,15 +1,12 @@ + - - - - - - - - - - - - + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/on_off_btn_an1.png b/app/src/main/res/drawable/on_off_btn_an1.png new file mode 100644 index 00000000..c80feeb7 Binary files /dev/null and b/app/src/main/res/drawable/on_off_btn_an1.png differ diff --git a/app/src/main/res/drawable/on_off_btn_an2.png b/app/src/main/res/drawable/on_off_btn_an2.png new file mode 100644 index 00000000..73f4cb7e Binary files /dev/null and b/app/src/main/res/drawable/on_off_btn_an2.png differ diff --git a/app/src/main/res/drawable/on_off_btn_an3.png b/app/src/main/res/drawable/on_off_btn_an3.png new file mode 100644 index 00000000..98ad0220 Binary files /dev/null and b/app/src/main/res/drawable/on_off_btn_an3.png differ diff --git a/app/src/main/res/drawable/on_off_btn_an4.png b/app/src/main/res/drawable/on_off_btn_an4.png new file mode 100644 index 00000000..49070e5f Binary files /dev/null and b/app/src/main/res/drawable/on_off_btn_an4.png differ diff --git a/app/src/main/res/drawable/on_off_btn_start_animation1.png b/app/src/main/res/drawable/on_off_btn_start_animation1.png deleted file mode 100644 index f9d18488..00000000 Binary files a/app/src/main/res/drawable/on_off_btn_start_animation1.png and /dev/null differ diff --git a/app/src/main/res/drawable/on_off_btn_start_animation2.png b/app/src/main/res/drawable/on_off_btn_start_animation2.png deleted file mode 100644 index 33b600c9..00000000 Binary files a/app/src/main/res/drawable/on_off_btn_start_animation2.png and /dev/null differ diff --git a/app/src/main/res/drawable/on_off_btn_start_animation3.png b/app/src/main/res/drawable/on_off_btn_start_animation3.png deleted file mode 100644 index 2172107a..00000000 Binary files a/app/src/main/res/drawable/on_off_btn_start_animation3.png and /dev/null differ diff --git a/app/src/main/res/drawable/on_off_btn_start_animation4.png b/app/src/main/res/drawable/on_off_btn_start_animation4.png deleted file mode 100644 index 8b744462..00000000 Binary files a/app/src/main/res/drawable/on_off_btn_start_animation4.png and /dev/null differ diff --git a/app/src/main/res/drawable/on_off_btn_start_animation5.png b/app/src/main/res/drawable/on_off_btn_start_animation5.png deleted file mode 100644 index 11bb16cd..00000000 Binary files a/app/src/main/res/drawable/on_off_btn_start_animation5.png and /dev/null differ -- cgit v1.2.3 From 1c605888bab7d7ebed2a401b90a018a8e109e7e2 Mon Sep 17 00:00:00 2001 From: cyBerta Date: Sat, 5 Feb 2022 04:57:21 +0100 Subject: remove insecure hint in EipFragment if VPN is connecting or reconnecting --- .../java/se/leap/bitmaskclient/base/fragments/EipFragment.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'app') 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 28879a71..dfa45614 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 @@ -416,14 +416,14 @@ public class EipFragment extends Fragment implements Observer { } Log.d(TAG, "eip fragment eipStatus state: " + eipStatus.getState() + " - level: " + eipStatus.getLevel() + " - is reconnecting: " + eipStatus.isReconnecting()); - if (eipStatus.isConnecting() ) { + if (eipStatus.isConnecting()) { setMainButtonEnabled(true); showConnectionTransitionLayout(true); locationButton.setText(getString(R.string.eip_status_start_pending)); locationButton.setLocationLoad(UNKNOWN); locationButton.showBridgeIndicator(false); locationButton.showRecommendedIndicator(false); - mainDescription.setText(R.string.eip_state_insecure); + mainDescription.setText(null); subDescription.setText(null); } else if (eipStatus.isConnected()) { setMainButtonEnabled(true); @@ -436,7 +436,7 @@ public class EipFragment extends Fragment implements Observer { mainDescription.setText(R.string.eip_state_connected); subDescription.setText(null); colorBackground(); - } else if(isOpenVpnRunningWithoutNetwork()){ + } else if(isOpenVpnRunningWithoutNetwork()) { Log.d(TAG, "eip fragment eipStatus - isOpenVpnRunningWithoutNetwork"); setMainButtonEnabled(true); mainButton.updateState(true, false, true); @@ -454,7 +454,7 @@ public class EipFragment extends Fragment implements Observer { locationButton.setLocationLoad(UNKNOWN); locationButton.showBridgeIndicator(false); locationButton.showRecommendedIndicator(false); - mainDescription.setText(R.string.eip_state_insecure); + mainDescription.setText(null); subDescription.setText(R.string.reconnecting); } else if (eipStatus.isDisconnecting()) { setMainButtonEnabled(false); -- cgit v1.2.3 From 2375f6a9f2ec395391cca524176d9c54635a14de Mon Sep 17 00:00:00 2001 From: cyBerta Date: Sat, 5 Feb 2022 05:06:42 +0100 Subject: fix NPE in GatewaysManager --- app/src/main/java/se/leap/bitmaskclient/eip/GatewaysManager.java | 3 +++ .../test/java/se/leap/bitmaskclient/eip/GatewaysManagerTest.java | 8 ++++++++ 2 files changed, 11 insertions(+) (limited to 'app') diff --git a/app/src/main/java/se/leap/bitmaskclient/eip/GatewaysManager.java b/app/src/main/java/se/leap/bitmaskclient/eip/GatewaysManager.java index 060e69f2..0dd4c26c 100644 --- a/app/src/main/java/se/leap/bitmaskclient/eip/GatewaysManager.java +++ b/app/src/main/java/se/leap/bitmaskclient/eip/GatewaysManager.java @@ -211,6 +211,9 @@ public class GatewaysManager { public Load getLoadForLocation(@Nullable String name, TransportType transportType) { Location location = getLocation(name); + if (location == null) { + return Load.UNKNOWN; + } return Load.getLoadByValue(location.getAverageLoad(transportType)); } diff --git a/app/src/test/java/se/leap/bitmaskclient/eip/GatewaysManagerTest.java b/app/src/test/java/se/leap/bitmaskclient/eip/GatewaysManagerTest.java index a3cde58b..729abcdf 100644 --- a/app/src/test/java/se/leap/bitmaskclient/eip/GatewaysManagerTest.java +++ b/app/src/test/java/se/leap/bitmaskclient/eip/GatewaysManagerTest.java @@ -20,6 +20,7 @@ import java.util.List; import de.blinkt.openvpn.VpnProfile; import de.blinkt.openvpn.core.ConfigParser; +import de.blinkt.openvpn.core.connection.Connection; import se.leap.bitmaskclient.base.models.Location; import se.leap.bitmaskclient.base.models.Provider; import se.leap.bitmaskclient.base.models.ProviderObservable; @@ -508,6 +509,13 @@ public class GatewaysManagerTest { assertEquals("Amsterdam", locations.get(2).getName()); } + @Test + public void testGetLoadForLocation_() { + MockHelper.mockProviderObservable(null); + GatewaysManager gatewaysManager = new GatewaysManager(mockContext); + assertEquals(GatewaysManager.Load.UNKNOWN, gatewaysManager.getLoadForLocation("unknown city", OPENVPN)); + } + private String getJsonStringFor(String filename) throws IOException { return TestSetupHelper.getInputAsString(getClass().getClassLoader().getResourceAsStream(filename)); } -- cgit v1.2.3