Merge pull request #54 from ivpn/GAA-51

GAA-51

Author: AlexKorvin

CHANGELOG.md

@@ -2,7 +2,7 @@
 
 All notable changes to this project will be documented in this file.
 
-## Version 2.4.0 - 2021-04-16
+## Version 2.4.0(2.4.1) - 2021-04-16
 
 [NEW] Possibility to mock GPS location  
 [NEW] Bypass VPN for local networks  

app/build.gradle

@@ -28,8 +28,8 @@ android {
         applicationId "net.ivpn.client"
         minSdkVersion 21
         targetSdkVersion 30
-        versionCode 95
-        versionName "2.4.0"
+        versionCode 96
+        versionName "2.4.1"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         testInstrumentationRunnerArguments clearPackageData: 'true'

app/src/main/java/net/ivpn/client/common/utils/ComponentUtil.java

@@ -97,8 +97,8 @@ public void performBaseComponentsInit() {
     }
 
     public void resetComponents() {
-        networkController.finishAll();
         preference.removeAll();
+        networkController.finishAll();
         globalBehaviorController.finishAll();
         updatesJobServiceUtil.clearUpdateJob(IVPNApplication.getApplication());
         updateHelper.skipUpdate();

app/src/main/java/net/ivpn/client/v2/network/NetworkViewModel.kt

@@ -223,7 +223,7 @@ class NetworkViewModel @Inject internal constructor(
             return
         }
         if (source == NetworkSource.WIFI) {
-            LOGGER.info("NetworkController", "onNetworkSourceChanged: ssid = " + source.ssid)
+            LOGGER.info("onNetworkSourceChanged: ssid = " + source.ssid)
         }
         networkSource.set(source)
         networkState.set(source.finalState)

app/src/main/java/net/ivpn/client/vpn/controller/VpnBehaviorController.java

@@ -137,7 +137,7 @@ public void onServerUpdated(Boolean forceConnect) {
 
     public void connectActionByRules() {
         LOGGER.info("connectActionByRules");
-        behavior.startConnecting(true);
+        behavior.startConnecting(false);
     }
 
     public void connectionActionByUser() {

app/src/main/java/net/ivpn/client/vpn/local/NetworkController.java

@@ -94,12 +94,21 @@ public NetworkController(NetworkProtectionPreference networkProtectionPreference
 
     public void init() {
         LOGGER.info("Init");
+        initInnerState();
+//        isWifiWatcherSettingEnabled = settingsPreference.getSettingNetworkRules();
+//        defaultState = networkProtectionPreference.getDefaultNetworkState();
+//        mobileState = networkProtectionPreference.getMobileDataNetworkState();
+//        trustedWiFis = networkProtectionPreference.getTrustedWifiList();
+//        untrustedWiFis = networkProtectionPreference.getUntrustedWifiList();
+        registerReceiver();
+    }
+
+    private void initInnerState() {
         isWifiWatcherSettingEnabled = settingsPreference.getSettingNetworkRules();
         defaultState = networkProtectionPreference.getDefaultNetworkState();
         mobileState = networkProtectionPreference.getMobileDataNetworkState();
         trustedWiFis = networkProtectionPreference.getTrustedWifiList();
         untrustedWiFis = networkProtectionPreference.getUntrustedWifiList();
-        registerReceiver();
     }
 
     public boolean isWifiWatcherSettingEnabled() {
@@ -541,7 +550,8 @@ public void finishAll() {
         LOGGER.info("finishAll");
         stopWifiWatcherService();
         source = null;
-        isWifiWatcherSettingEnabled = false;
+        initInnerState();
+//        isWifiWatcherSettingEnabled = false;
     }
 
     public void changeConnectToVpnRule(boolean isEnabled) {