[MA] revisar permisos via snackbar

apk/controller/.gitignore

@@ -1,4 +1,5 @@
 .gradle
+.idea/deploymentTargetSelector.xml
 app/.externalNativeBuild
 app/build
 app/release

apk/controller/.idea/deploymentTargetSelector.xml

@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="deploymentTargetSelector">
-    <selectionStates>
-      <SelectionState runConfigName="app">
-        <option name="selectionMode" value="DROPDOWN" />
-        <DropdownSelection timestamp="2026-03-07T07:26:40.093624067Z">
-          <Target type="DEFAULT_BOOT">
-            <handle>
-              <DeviceId pluginId="PhysicalDevice" identifier="serial=RF8Y80CE2DA" />
-            </handle>
-          </Target>
-        </DropdownSelection>
-        <DialogSelection />
-      </SelectionState>
-      <SelectionState runConfigName="New Run Config">
-        <option name="selectionMode" value="DROPDOWN" />
-        <DropdownSelection timestamp="2026-03-06T00:03:16.988860344Z">
-          <Target type="DEFAULT_BOOT">
-            <handle>
-              <DeviceId pluginId="PhysicalDevice" identifier="serial=a026a310" />
-            </handle>
-          </Target>
-        </DropdownSelection>
-        <DialogSelection />
-      </SelectionState>
-    </selectionStates>
-  </component>
-</project>

apk/controller/app/build.gradle

@@ -77,4 +77,5 @@ android {
 dependencies {
 	implementation 'androidx.appcompat:appcompat:1.4.1'
 	implementation 'androidx.biometric:biometric:1.1.0'
+	implementation 'com.google.android.material:material:1.11.0'
 }

apk/controller/app/src/main/java/org/iiab/controller/MainActivity.java

@@ -49,6 +49,7 @@ import androidx.annotation.NonNull;
 import androidx.biometric.BiometricManager;
 import androidx.biometric.BiometricPrompt;
 import androidx.core.content.ContextCompat;
+import com.google.android.material.snackbar.Snackbar;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -99,6 +100,7 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
 
 	private ActivityResultLauncher<Intent> vpnPermissionLauncher;
 	private ActivityResultLauncher<String[]> requestPermissionsLauncher;
+	private ActivityResultLauncher<Intent> batteryOptLauncher;
 	
 	private boolean isReadingLogs = false;
 	private final Handler sizeUpdateHandler = new Handler();
@@ -133,6 +135,14 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
 				}
 		);
 
+		batteryOptLauncher = registerForActivityResult(
+				new ActivityResultContracts.StartActivityForResult(),
+				result -> {
+					Log.d(TAG, "Regresamos de la pantalla de ajustes de batería");
+					checkBatteryOptimizations();
+				}
+		);
+
 		requestPermissionsLauncher = registerForActivityResult(
 				new ActivityResultContracts.RequestMultiplePermissions(),
 				result -> {
@@ -221,6 +231,13 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
 		};
 	}
 
+	private void showBatterySnackbar() {
+		View rootView = findViewById(android.R.id.content);
+		Snackbar.make(rootView, R.string.battery_opt_denied, Snackbar.LENGTH_INDEFINITE)
+				.setAction(R.string.fix_action, v -> checkBatteryOptimizations())
+				.show();
+	}
+
 	private void initiatePermissionChain() {
 		List<String> permissions = new ArrayList<>();
 		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
@@ -356,6 +373,16 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
 	@Override
 	protected void onResume() {
 		super.onResume();
+		// Comprobamos batería siempre que volvemos a la app
+		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+			PowerManager pm = (PowerManager) getSystemService(Context.POWER_SERVICE);
+			if (pm != null && !pm.isIgnoringBatteryOptimizations(getPackageName())) {
+				// Si no está ignorado, mostramos el aviso (o Snackbar si ya se lanzó el diálogo)
+				Log.d(TAG, "onResume: Batería aún optimizada, mostrando aviso");
+				showBatterySnackbar();
+			}
+		}
+
 		if (getIntent() != null && getIntent().getBooleanExtra(VpnRecoveryReceiver.EXTRA_RECOVERY, false)) {
 			addToLog(getString(R.string.recovery_pulse_received));
 			Intent vpnIntent = new Intent(this, TProxyService.class);
@@ -377,55 +404,71 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
             PowerManager pm = (PowerManager) getSystemService(Context.POWER_SERVICE);
             if (pm != null && !pm.isIgnoringBatteryOptimizations(getPackageName())) {
-                String manufacturer = Build.MANUFACTURER.toLowerCase();
+				String manufacturer = Build.MANUFACTURER.toLowerCase();
-                String message = getString(R.string.battery_opt_msg);
+				String message = getString(R.string.battery_opt_msg);
 
-                if (manufacturer.contains("oppo") || manufacturer.contains("realme")) {
+				if (manufacturer.contains("oppo") || manufacturer.contains("realme") || manufacturer.contains("xiaomi")) {
-                    message += getString(R.string.battery_opt_oppo_extra);
-                } else if (manufacturer.contains("xiaomi")) {
-                    message += getString(R.string.battery_opt_xiaomi_extra);
-                }
 
-                new AlertDialog.Builder(this)
+					if (manufacturer.contains("oppo") || manufacturer.contains("realme")) {
-                    .setTitle(R.string.battery_opt_title)
+						message += getString(R.string.battery_opt_oppo_extra);
-                    .setMessage(message)
+					} else if (manufacturer.contains("xiaomi")) {
-                    .setPositiveButton(R.string.go_to_settings, (dialog, which) -> openBatterySettings(manufacturer))
+						message += getString(R.string.battery_opt_xiaomi_extra);
-                    .setNegativeButton(R.string.cancel, null)
+					}
-                    .show();
+
-            }
+					new AlertDialog.Builder(this)
+							.setTitle(R.string.battery_opt_title)
+							.setMessage(message)
+							.setPositiveButton(R.string.go_to_settings, (dialog, which) -> openBatterySettings(manufacturer))
+							.setNegativeButton(R.string.cancel, null)
+							.show();
+				}
+				else {
+					Intent intent = new Intent(Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS);
+					intent.setData(Uri.parse("package:" + getPackageName()));
+					batteryOptLauncher.launch(intent);
+				}
+			}
         }
     }
 
-    private void openBatterySettings(String manufacturer) {
+	private void openBatterySettings(String manufacturer) {
-        if (manufacturer.contains("oppo") || manufacturer.contains("realme")) {
+		boolean success = false;
-            try {
-                Intent intent = new Intent();
-                intent.setComponent(new ComponentName("com.coloros.safecenter", "com.coloros.safecenter.permission.startup.StartupAppListActivity"));
-                startActivity(intent);
-                return;
-            } catch (Exception e) {
-                try {
-                    Intent intent = new Intent();
-                    intent.setComponent(new ComponentName("com.coloros.oppoguardelf", "com.coloros.oppoguardelf.Permission.BackgroundAllowAppListActivity"));
-                    startActivity(intent);
-                    return;
-                } catch (Exception e2) {}
-            }
-        } else if (manufacturer.contains("xiaomi")) {
-            try {
-                Intent intent = new Intent("miui.intent.action.APP_BATTERY_SAVER_SETTINGS");
-                intent.setComponent(new ComponentName("com.miui.powerkeeper", "com.miui.powerkeeper.ui.HiddenAppsConfigActivity"));
-                intent.putExtra("package_name", getPackageName());
-                intent.putExtra("package_label", getString(R.string.app_name));
-                startActivity(intent);
-                return;
-            } catch (Exception e) {}
-        }
 
-        Intent intent = new Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
+		if (manufacturer.contains("oppo") || manufacturer.contains("realme")) {
-        intent.setData(Uri.parse("package:" + getPackageName()));
+			try {
-        startActivity(intent);
+				Intent intent = new Intent();
-    }
+				intent.setComponent(new ComponentName("com.coloros.safecenter", "com.coloros.safecenter.permission.startup.StartupAppListActivity"));
+				startActivity(intent);
+				success = true;
+			} catch (Exception e) {
+				try {
+					Intent intent = new Intent();
+					intent.setComponent(new ComponentName("com.coloros.oppoguardelf", "com.coloros.oppoguardelf.Permission.BackgroundAllowAppListActivity"));
+					startActivity(intent);
+					success = true;
+				} catch (Exception e2) {}
+			}
+		}
+		else if (manufacturer.contains("xiaomi")) {
+			try {
+				Intent intent = new Intent("miui.intent.action.APP_BATTERY_SAVER_SETTINGS");
+				intent.setComponent(new ComponentName("com.miui.powerkeeper", "com.miui.powerkeeper.ui.HiddenAppsConfigActivity"));
+				intent.putExtra("package_name", getPackageName());
+				intent.putExtra("package_label", getString(R.string.app_name));
+				startActivity(intent);
+				success = true;
+			} catch (Exception e) {}
+		}
+
+		if (!success) {
+			try {
+				Intent intent = new Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
+				intent.setData(Uri.parse("package:" + getPackageName()));
+				startActivity(intent);
+			} catch (Exception ex) {
+			}
+		}
+	}
 
 	private void toggleTheme() {
 		SharedPreferences sharedPref = getPreferences(Context.MODE_PRIVATE);

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

@@ -79,5 +79,7 @@
 
 	<!-- Brand specific battery warnings -->
 	<string name="battery_opt_oppo_extra">\n\nOPPO/Realme detected: Please ensure you also enable \'Allow background activity\' in this app\'s settings.</string>
-	<string name="battery_opt_xiaomi_extra">\n\nXiaomi detected: Please set battery saver to \'No restrictions\' for this app.</string>
+	<string name="battery_opt_xiaomi_extra">\n\nXiaomi detected: Please set battery saver to \'No restrictions\' in settings.</string>
+    <string name="battery_opt_denied">Para que la app funcione al 100%, desactiva la optimización de batería.</string>
+    <string name="fix_action">SOLUCIONAR</string>
 </resources>