Merge branch 'vpn_ttl_fixer'

ChangeLog.md

@@ -124,3 +124,6 @@
 **InviZible Pro beta 0.6.3**
 * Implemented Fix TTL option based on the local VPN (root is still required).
 * Fixes.
+
+**InviZible Pro beta 0.6.4**
+* Bug fixes and stability improvements.

fastlane/metadata/android/en-US/changelogs/100064.txt

@@ -0,0 +1,2 @@
+**InviZible Pro beta 0.6.4**
+* Bug fixes and stability improvements.

tordnscrypt/build.gradle

@@ -10,7 +10,7 @@ android {
 
         fdroid{
             applicationId "pan.alexander.tordnscrypt"
-            versionName "0.6.3-beta"
+            versionName "0.6.4-beta"
             dimension = 'version'
             resValue 'string', 'package_name', applicationId
         }
@@ -40,7 +40,7 @@ android {
     defaultConfig {
         minSdkVersion 19
         targetSdkVersion 29
-        versionCode 63
+        versionCode 64
 
         resConfigs "en", "ru-rRU" , "ru-rUA", "pl"
 

tordnscrypt/owner.gradle

@@ -45,7 +45,7 @@ android {
 
         beta {
             applicationId "pan.alexander.tordnscrypt"
-            versionName "0.6.3"
+            versionName "0.6.4"
             dimension = 'version'
             signingConfig signingConfigs.betasign
             resValue 'string', 'package_name', applicationId
@@ -86,7 +86,7 @@ android {
     defaultConfig {
         minSdkVersion 19
         targetSdkVersion 29
-        versionCode 63
+        versionCode 64
 
         resConfigs "en", "ru-rRU", "ru-rUA", "pl"
 

tordnscrypt/src/google_play/AndroidManifest.xml

@@ -99,11 +99,8 @@
             <intent-filter>
                 <action android:name="android.intent.action.BOOT_COMPLETED" />
                 <action android:name="android.intent.action.QUICKBOOT_POWERON" />
-                <action android:name="android.intent.action.REBOOT" />
                 <action android:name="android.intent.action.MY_PACKAGE_REPLACED"/>
                 <action android:name="com.htc.intent.action.QUICKBOOT_POWERON"/>
-
-                <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </receiver>
 

tordnscrypt/src/main/AndroidManifest.xml

@@ -94,11 +94,8 @@
             <intent-filter>
                 <action android:name="android.intent.action.BOOT_COMPLETED" />
                 <action android:name="android.intent.action.QUICKBOOT_POWERON" />
-                <action android:name="android.intent.action.REBOOT" />
                 <action android:name="android.intent.action.MY_PACKAGE_REPLACED"/>
                 <action android:name="com.htc.intent.action.QUICKBOOT_POWERON"/>
-
-                <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </receiver>
 

tordnscrypt/src/main/java/pan/alexander/tordnscrypt/BootCompleteReceiver.java

@@ -58,6 +58,8 @@ public class BootCompleteReceiver extends BroadcastReceiver {
     @Override
     public void onReceive(final Context context, Intent intent) {
 
+        Log.i(LOG_TAG, "Receive Boot Completed");
+
         final String BOOT_COMPLETE = "android.intent.action.BOOT_COMPLETED";
         this.context = context.getApplicationContext();
 

tordnscrypt/src/main/java/pan/alexander/tordnscrypt/dnscrypt_fragment/DNSCryptFragmentPresenter.java

@@ -618,7 +618,7 @@ public void startButtonOnClick(Context context) {
 
         view.setDNSCryptStartButtonEnabled(false);
 
-        cleanLogFileNoRootMethod(context);
+        //cleanLogFileNoRootMethod(context);
 
 
         if (new PrefManager(context).getBoolPref("Tor Running")

tordnscrypt/src/main/java/pan/alexander/tordnscrypt/itpd_fragment/ITPDFragmentPresenter.java

@@ -453,7 +453,7 @@ public void startButtonOnClick(Context context) {
 
         view.setITPDStartButtonEnabled(false);
 
-        cleanLogFileNoRootMethod();
+        //cleanLogFileNoRootMethod();
 
         if (!new PrefManager(Objects.requireNonNull(context)).getBoolPref("I2PD Running")
                 && new PrefManager(Objects.requireNonNull(context)).getBoolPref("Tor Running")

tordnscrypt/src/main/java/pan/alexander/tordnscrypt/modules/ModulesBroadcastReceiver.java

@@ -62,30 +62,36 @@ public class ModulesBroadcastReceiver extends BroadcastReceiver {
     private int currentNetworkHash = 0;
     private static final String apStateFilterAction = "android.net.wifi.WIFI_AP_STATE_CHANGED";
     private static final String tetherStateFilterAction = "android.net.conn.TETHER_STATE_CHANGED";
+    private static final String shutdownFilterAction = "android.intent.action.ACTION_SHUTDOWN";
+    private static final String powerOFFFilterAction = "android.intent.action.QUICKBOOT_POWEROFF";
 
     public ModulesBroadcastReceiver(Context context) {
         this.context = context;
     }
 
     @Override
     public void onReceive(Context context, Intent intent) {
-        if (intent.getAction() == null) {
+        String action = intent.getAction();
+
+        if (action == null) {
             return;
         }
 
-        if (intent.getAction().equals(PowerManager.ACTION_DEVICE_IDLE_MODE_CHANGED)
+        if (action.equalsIgnoreCase(PowerManager.ACTION_DEVICE_IDLE_MODE_CHANGED)
                 && Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
 
             Log.i(LOG_TAG, "ModulesBroadcastReceiver Received " + intent);
 
             idleStateChanged(context);
 
-        } else if (intent.getAction().equals(ConnectivityManager.CONNECTIVITY_ACTION)) {
+        } else if (action.equalsIgnoreCase(ConnectivityManager.CONNECTIVITY_ACTION)) {
             connectivityStateChanged(intent);
-        } else if (intent.getAction().equals(apStateFilterAction)) {
+        } else if (action.equalsIgnoreCase(apStateFilterAction)) {
             apStateChanged();
-        } else if (intent.getAction().equals(tetherStateFilterAction)) {
+        } else if (action.equalsIgnoreCase(tetherStateFilterAction)) {
             tetherStateChanged();
+        } else if (action.equalsIgnoreCase(powerOFFFilterAction) || action.equalsIgnoreCase(shutdownFilterAction)) {
+            powerOFFDetected();
         }
     }
 
@@ -94,6 +100,7 @@ void registerReceivers() {
         registerConnectivityChanges();
         registerAPisOn();
         registerUSBModemIsOn();
+        registerPowerOFF();
     }
 
     void unregisterReceivers() {
@@ -148,6 +155,14 @@ private void registerUSBModemIsOn() {
         receiverRegistered = true;
     }
 
+    private void registerPowerOFF() {
+        IntentFilter powerOFF = new IntentFilter();
+        powerOFF.addAction(shutdownFilterAction);
+        powerOFF.addAction(powerOFFFilterAction);
+        context.registerReceiver(this, powerOFF);
+        receiverRegistered = true;
+    }
+
     @TargetApi(Build.VERSION_CODES.LOLLIPOP)
     private void listenNetworkChanges() {
         // Listen for network changes
@@ -281,6 +296,14 @@ private void tetherStateChanged() {
         Log.i(LOG_TAG, "ModulesBroadcastReceiver USB modem state is " + (Tethering.usbTetherOn ? "ON" : "OFF"));
     }
 
+    private void powerOFFDetected() {
+        new PrefManager(context).setBoolPref("DNSCrypt Running", false);
+        new PrefManager(context).setBoolPref("Tor Running", false);
+        new PrefManager(context).setBoolPref("I2PD Running", false);
+
+        ModulesAux.stopModulesIfRunning(context);
+    }
+
     @TargetApi(Build.VERSION_CODES.LOLLIPOP)
     private void unlistenNetworkChanges() {
         ConnectivityManager cm = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);