[bugfix] xiaomi

Author: batchar2

app/src/main/java/org/fptn/vpn/services/vpn/FptnService.java

@@ -182,7 +182,6 @@ public IBinder onBind(Intent intent) {
     }
     /* binder part END */
 
-
     public void updateSpeedInfo(String downloadSpeed, String uploadSpeed, long duration, long totalDownload, long totalUpload, long downloadBps, long uploadBps) {
         if (serviceStateMutableLiveData.getValue().getConnectionState() == ConnectionState.CONNECTED) {
             if (SharedPrefUtils.getShowSpeedInNotification(getApplication())) {
@@ -419,6 +418,12 @@ public int onStartCommand(Intent intent, int flags, int startId) {
 
             if (!NetworkUtils.isOnline(connectivityManager)) {
                 XLog.tag(TAG).i("No internet — entering WAITING_FOR_NETWORK state");
+                // This IS the "reconnect on network loss" scenario the attempts setting is for:
+                // when the network returns half-alive, the first failed scan must go through the
+                // recovery cycle (retry/scan per the configured budget), not die with a terminal
+                // "all servers unreachable" — with restoringSession=false it did exactly that.
+                restoringSession = true;
+                remainingFallbackBudget.set(SharedPrefUtils.getReconnectAttemptsCount(this));
                 pendingServerId = intent.getIntExtra(SELECTED_SERVER, SELECTED_SERVER_ID_AUTO);
                 updateNotificationWithMessage(getString(R.string.waiting_for_network), "");
                 setConnectionState(ConnectionState.WAITING_FOR_NETWORK, null);

app/src/main/java/org/fptn/vpn/utils/PermissionsUtils.java

@@ -27,10 +27,12 @@
 import android.app.NotificationChannel;
 import android.app.NotificationManager;
 import android.content.Context;
+import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.net.ConnectivityManager;
 import android.net.Network;
 import android.net.NetworkCapabilities;
+import android.net.Uri;
 import android.os.Build;
 import android.os.PowerManager;
 import android.provider.Settings;
@@ -139,21 +141,49 @@ public static boolean checkNotificationEnabled(Context context) {
     }
 
     public static boolean checkBatteryOptimizations(Context context) {
-        if ("xiaomi".equalsIgnoreCase(Build.MANUFACTURER)) {
-            XLog.tag(TAG).i("Battery optimization check skipped [manufacturer=%s, brand=%s, model=%s]",
-                    Build.MANUFACTURER, Build.BRAND, Build.MODEL);
-            return true;
-        }
         boolean isGranted = false;
         PowerManager powerManager = (PowerManager) context.getSystemService(POWER_SERVICE);
         if (powerManager != null) {
             isGranted = powerManager.isIgnoringBatteryOptimizations(context.getPackageName());
         }
+        // MIUI (Xiaomi/Redmi/POCO all report MANUFACTURER=xiaomi) runs its own battery manager;
+        // isIgnoringBatteryOptimizations() stays false even after the user grants the exemption.
+        // Trusting it would nag on every connect and never let the first-run flow complete, so once
+        // we have sent the user to the system dialog we treat the exemption as handled here.
+        if (!isGranted && isXiaomi() && SharedPrefUtils.isBatteryOptimizationRequested(context)) {
+            isGranted = true;
+        }
         XLog.tag(TAG).i("Battery optimization exemption [granted=%b, manufacturer=%s, brand=%s, model=%s]",
                 isGranted, Build.MANUFACTURER, Build.BRAND, Build.MODEL);
         return isGranted;
     }
 
+    public static boolean isXiaomi() {
+        return "xiaomi".equalsIgnoreCase(Build.MANUFACTURER)
+                || "xiaomi".equalsIgnoreCase(Build.BRAND)
+                || "redmi".equalsIgnoreCase(Build.BRAND)
+                || "poco".equalsIgnoreCase(Build.BRAND);
+    }
+
+    /**
+     * Opens the app-details screen so the user can reach the MIUI background / battery controls
+     * (the standard battery-optimization exemption is not enough on MIUI).
+     *
+     * @return true if some settings screen was launched.
+     */
+    public static boolean openMiuiBackgroundSettings(Context context) {
+        try {
+            Intent intent = new Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
+            intent.setData(Uri.parse("package:" + context.getPackageName()));
+            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+            context.startActivity(intent);
+            return true;
+        } catch (Exception e) {
+            XLog.tag(TAG).e("Failed to open settings for MIUI guidance: %s", e.getMessage());
+            return false;
+        }
+    }
+
     public static boolean checkBackgroundDataTransferRestrictions(Context context) {
         boolean isGranted = false;
         ConnectivityManager connectivityManager = (ConnectivityManager) context.getSystemService(CONNECTIVITY_SERVICE);

app/src/main/java/org/fptn/vpn/utils/SharedPrefUtils.java

@@ -66,6 +66,26 @@ public static void savePermissionsRequested(Context context, boolean requested)
         sharedPreferences.edit().putBoolean(Constants.PERMISSIONS_REQUESTED_SHARED_PREF_KEY, requested).apply();
     }
 
+    public static boolean isBatteryOptimizationRequested(Context context) {
+        SharedPreferences sharedPreferences = context.getSharedPreferences(Constants.APPLICATION_SHARED_PREFERENCES, Context.MODE_PRIVATE);
+        return sharedPreferences.getBoolean(Constants.BATTERY_OPTIMIZATION_REQUESTED_SHARED_PREF_KEY, false);
+    }
+
+    public static void saveBatteryOptimizationRequested(Context context, boolean requested) {
+        SharedPreferences sharedPreferences = context.getSharedPreferences(Constants.APPLICATION_SHARED_PREFERENCES, Context.MODE_PRIVATE);
+        sharedPreferences.edit().putBoolean(Constants.BATTERY_OPTIMIZATION_REQUESTED_SHARED_PREF_KEY, requested).apply();
+    }
+
+    public static boolean isXiaomiBackgroundHintShown(Context context) {
+        SharedPreferences sharedPreferences = context.getSharedPreferences(Constants.APPLICATION_SHARED_PREFERENCES, Context.MODE_PRIVATE);
+        return sharedPreferences.getBoolean(Constants.XIAOMI_BACKGROUND_HINT_SHOWN_SHARED_PREF_KEY, false);
+    }
+
+    public static void saveXiaomiBackgroundHintShown(Context context, boolean shown) {
+        SharedPreferences sharedPreferences = context.getSharedPreferences(Constants.APPLICATION_SHARED_PREFERENCES, Context.MODE_PRIVATE);
+        sharedPreferences.edit().putBoolean(Constants.XIAOMI_BACKGROUND_HINT_SHOWN_SHARED_PREF_KEY, shown).apply();
+    }
+
     /* QUICK SETTINGS TILE */
     public static boolean isQuickSettingsTileRequested(Context context) {
         SharedPreferences sharedPreferences = context.getSharedPreferences(Constants.APPLICATION_SHARED_PREFERENCES, Context.MODE_PRIVATE);

app/src/main/java/org/fptn/vpn/views/home/HomeActivity.java

@@ -392,6 +392,14 @@ public void onClickToStartStop(View v) {
     }
 
     private void proceedToVpnConnect() {
+        // MIUI kills background apps regardless of the battery exemption, dropping the VPN (and
+        // leaking the real IP) while the screen is off. Guide Xiaomi users to the background /
+        // battery settings once before the first connect.
+        if (PermissionsUtils.isXiaomi() && !SharedPrefUtils.isXiaomiBackgroundHintShown(this)) {
+            SharedPrefUtils.saveXiaomiBackgroundHintShown(this, true);
+            showXiaomiBackgroundHintDialog();
+            return;
+        }
         if (PermissionsUtils.isAlwaysOnVpnEnabledByAnotherApp(this)) {
             startStopButton.setChecked(false);
             showVpnSwitchDialog();
@@ -400,6 +408,21 @@ private void proceedToVpnConnect() {
         connectVpn();
     }
 
+    private void showXiaomiBackgroundHintDialog() {
+        new AlertDialog.Builder(this)
+                .setTitle(R.string.xiaomi_background_hint_title)
+                .setMessage(R.string.xiaomi_background_hint_text)
+                .setCancelable(false)
+                .setPositiveButton(R.string.xiaomi_background_hint_open, (d, w) -> {
+                    // User is heading into system settings — don't auto-connect; they can tap
+                    // connect again when they return (the hint won't show a second time).
+                    startStopButton.setChecked(false);
+                    PermissionsUtils.openMiuiBackgroundSettings(this);
+                })
+                .setNegativeButton(R.string.xiaomi_background_hint_later, (d, w) -> proceedToVpnConnect())
+                .show();
+    }
+
     private void connectVpn() {
         Intent intent = VpnService.prepare(this);
         if (intent != null) {
@@ -506,6 +529,9 @@ private void requestRequiredPermissions() {
                     if (!PermissionsUtils.checkBatteryOptimizations(this)) {
                         //Manifest.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS
                         requestedPermissions.incrementAndGet();
+                        // On MIUI the OS never reports the exemption back — record that we asked so
+                        // the check can settle instead of re-prompting on every connect.
+                        SharedPrefUtils.saveBatteryOptimizationRequested(this, true);
                         startActivityWithSettings(Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS);
                     }
                     // Background data transfer restriction permission

app/src/main/java/org/fptn/vpn/views/settings/SettingsActivity.java

@@ -46,6 +46,7 @@
 
 import org.fptn.vpn.R;
 import org.fptn.vpn.utils.PermissionsUtils;
+import org.fptn.vpn.utils.SharedPrefUtils;
 import org.fptn.vpn.views.CustomBottomNavigationListener;
 import org.fptn.vpn.views.experimentalsettings.ExperimentalSettingsActivity;
 import org.fptn.vpn.views.log.LogsActivity;
@@ -178,6 +179,9 @@ private void requestBatteryOptimisationPermission() {
                 .setPositiveButton(getString(R.string.grant), (d, w) -> {
                     @SuppressLint("BatteryLife") Intent intent = new Intent(Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS);
                     intent.setData(Uri.parse("package:" + getPackageName()));
+                    // On MIUI the OS never reports the exemption back — record that we asked so the
+                    // toggle can settle to granted instead of always showing off.
+                    SharedPrefUtils.saveBatteryOptimizationRequested(this, true);
                     startActivity(intent);
                 })
                 .setNegativeButton(getString(R.string.deny), (dialog, which) -> {

app/src/main/res/values-ru-rRU/strings.xml

@@ -127,6 +127,10 @@ https://play.google.com/store/apps/details?id=org.fptn.vpn
     <string name="warning">Внимание</string>
     <string name="battery_optimization_request_dialog_title">Откл оптимизацию батареи</string>
     <string name="battery_optimization_request_dialog_text">Для стабильного подключения предоставьте разрешение на отключение оптимизации энергопотребления для этого приложения</string>
+    <string name="xiaomi_background_hint_title">Разрешите работу в фоне</string>
+    <string name="xiaomi_background_hint_text">MIUI останавливает приложения в фоне — из-за этого VPN отваливается при выключенном экране, а реальный IP может утечь. Чтобы соединение не рвалось, выберите «Экономия батареи» → «Без ограничений» для этого приложения.</string>
+    <string name="xiaomi_background_hint_open">Открыть настройки</string>
+    <string name="xiaomi_background_hint_later">Продолжить</string>
 
     <string name="required_permissions">Необходимые разрешения:</string>
     <string name="denied_text">ОТКЛОНЕНО</string>

app/src/main/res/values/strings.xml

@@ -138,6 +138,10 @@ https://play.google.com/store/apps/details?id=org.fptn.vpn
 
     <string name="battery_optimization_request_dialog_title">Disable battery optimization</string>
     <string name="battery_optimization_request_dialog_text">For a stable connection, please grant permission to disable battery optimization for this app</string>
+    <string name="xiaomi_background_hint_title">Allow background operation</string>
+    <string name="xiaomi_background_hint_text">MIUI stops apps in the background, so the VPN drops while the screen is off and your real IP can leak. To keep the connection alive, set \"Battery saver\" to \"No restrictions\" for this app.</string>
+    <string name="xiaomi_background_hint_open">Open settings</string>
+    <string name="xiaomi_background_hint_later">Continue</string>
 
     <string name="required_permissions">Required permissions:</string>
     <string name="granted_text">GRANTED</string>

core/common/src/main/kotlin/org/fptn/vpn/core/common/Constants.kt

@@ -52,6 +52,8 @@ object Constants {
     const val RESET_SELECTED_SERVER_ON_EXCEPTION_PREF_KEY: String = "RESET_SELECTED_SERVER_ON_EXCEPTION_PREF_KEY"
     const val APPLICATION_SHARED_PREFERENCES = "fptnvpn-shared-preferences"
     const val PERMISSIONS_REQUESTED_SHARED_PREF_KEY: String = "permissions_requested_previously"
+    const val BATTERY_OPTIMIZATION_REQUESTED_SHARED_PREF_KEY: String = "battery_optimization_requested"
+    const val XIAOMI_BACKGROUND_HINT_SHOWN_SHARED_PREF_KEY: String = "xiaomi_background_hint_shown"
     const val RECONNECT_ON_CHANGE_IP_ENABLED_SHARED_PREF_KEY: String = "RECONNECT_ON_CHANGE_IP_ENABLED_V2"
     const val RECONNECT_ON_CHANGE_NETWORK_TYPE_ENABLED_SHARED_PREF_KEY: String =
         "RECONNECT_ON_CHANGE_NETWORK_TYPE_ENABLED"