mirror of https://github.com/M66B/NetGuard.git
Use non-exported receivers
This commit is contained in:
parent
dbf0d9651c
commit
99c58283f2
|
@ -377,7 +377,7 @@ public class ActivityMain extends AppCompatActivity implements SharedPreferences
|
||||||
intentFilter.addAction(Intent.ACTION_PACKAGE_ADDED);
|
intentFilter.addAction(Intent.ACTION_PACKAGE_ADDED);
|
||||||
intentFilter.addAction(Intent.ACTION_PACKAGE_REMOVED);
|
intentFilter.addAction(Intent.ACTION_PACKAGE_REMOVED);
|
||||||
intentFilter.addDataScheme("package");
|
intentFilter.addDataScheme("package");
|
||||||
registerReceiver(packageChangedReceiver, intentFilter);
|
ContextCompat.registerReceiver(this, packageChangedReceiver, intentFilter, ContextCompat.RECEIVER_NOT_EXPORTED);
|
||||||
|
|
||||||
// First use
|
// First use
|
||||||
if (!initialized) {
|
if (!initialized) {
|
||||||
|
|
|
@ -61,6 +61,7 @@ import androidx.annotation.NonNull;
|
||||||
import androidx.appcompat.app.AlertDialog;
|
import androidx.appcompat.app.AlertDialog;
|
||||||
import androidx.appcompat.app.AppCompatActivity;
|
import androidx.appcompat.app.AppCompatActivity;
|
||||||
import androidx.core.app.NavUtils;
|
import androidx.core.app.NavUtils;
|
||||||
|
import androidx.core.content.ContextCompat;
|
||||||
import androidx.core.util.PatternsCompat;
|
import androidx.core.util.PatternsCompat;
|
||||||
import androidx.localbroadcastmanager.content.LocalBroadcastManager;
|
import androidx.localbroadcastmanager.content.LocalBroadcastManager;
|
||||||
import androidx.preference.PreferenceManager;
|
import androidx.preference.PreferenceManager;
|
||||||
|
@ -454,12 +455,12 @@ public class ActivitySettings extends AppCompatActivity implements SharedPrefere
|
||||||
IntentFilter ifInteractive = new IntentFilter();
|
IntentFilter ifInteractive = new IntentFilter();
|
||||||
ifInteractive.addAction(Intent.ACTION_SCREEN_ON);
|
ifInteractive.addAction(Intent.ACTION_SCREEN_ON);
|
||||||
ifInteractive.addAction(Intent.ACTION_SCREEN_OFF);
|
ifInteractive.addAction(Intent.ACTION_SCREEN_OFF);
|
||||||
registerReceiver(interactiveStateReceiver, ifInteractive);
|
ContextCompat.registerReceiver(this, interactiveStateReceiver, ifInteractive, ContextCompat.RECEIVER_NOT_EXPORTED);
|
||||||
|
|
||||||
// Listen for connectivity updates
|
// Listen for connectivity updates
|
||||||
IntentFilter ifConnectivity = new IntentFilter();
|
IntentFilter ifConnectivity = new IntentFilter();
|
||||||
ifConnectivity.addAction(ConnectivityManager.CONNECTIVITY_ACTION);
|
ifConnectivity.addAction(ConnectivityManager.CONNECTIVITY_ACTION);
|
||||||
registerReceiver(connectivityChangedReceiver, ifConnectivity);
|
ContextCompat.registerReceiver(this, connectivityChangedReceiver, ifConnectivity, ContextCompat.RECEIVER_NOT_EXPORTED);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -347,7 +347,7 @@ public class ServiceSinkhole extends VpnService implements SharedPreferences.OnS
|
||||||
ifInteractive.addAction(Intent.ACTION_SCREEN_ON);
|
ifInteractive.addAction(Intent.ACTION_SCREEN_ON);
|
||||||
ifInteractive.addAction(Intent.ACTION_SCREEN_OFF);
|
ifInteractive.addAction(Intent.ACTION_SCREEN_OFF);
|
||||||
ifInteractive.addAction(ACTION_SCREEN_OFF_DELAYED);
|
ifInteractive.addAction(ACTION_SCREEN_OFF_DELAYED);
|
||||||
registerReceiver(interactiveStateReceiver, ifInteractive);
|
ContextCompat.registerReceiver(ServiceSinkhole.this, interactiveStateReceiver, ifInteractive, ContextCompat.RECEIVER_NOT_EXPORTED);
|
||||||
registeredInteractiveState = true;
|
registeredInteractiveState = true;
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
@ -2440,7 +2440,7 @@ public class ServiceSinkhole extends VpnService implements SharedPreferences.OnS
|
||||||
IntentFilter ifUser = new IntentFilter();
|
IntentFilter ifUser = new IntentFilter();
|
||||||
ifUser.addAction(Intent.ACTION_USER_BACKGROUND);
|
ifUser.addAction(Intent.ACTION_USER_BACKGROUND);
|
||||||
ifUser.addAction(Intent.ACTION_USER_FOREGROUND);
|
ifUser.addAction(Intent.ACTION_USER_FOREGROUND);
|
||||||
registerReceiver(userReceiver, ifUser);
|
ContextCompat.registerReceiver(this, userReceiver, ifUser, ContextCompat.RECEIVER_NOT_EXPORTED);
|
||||||
registeredUser = true;
|
registeredUser = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2448,7 +2448,7 @@ public class ServiceSinkhole extends VpnService implements SharedPreferences.OnS
|
||||||
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
|
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
|
||||||
IntentFilter ifIdle = new IntentFilter();
|
IntentFilter ifIdle = new IntentFilter();
|
||||||
ifIdle.addAction(PowerManager.ACTION_DEVICE_IDLE_MODE_CHANGED);
|
ifIdle.addAction(PowerManager.ACTION_DEVICE_IDLE_MODE_CHANGED);
|
||||||
registerReceiver(idleStateReceiver, ifIdle);
|
ContextCompat.registerReceiver(this, idleStateReceiver, ifIdle, ContextCompat.RECEIVER_NOT_EXPORTED);
|
||||||
registeredIdleState = true;
|
registeredIdleState = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2457,7 +2457,7 @@ public class ServiceSinkhole extends VpnService implements SharedPreferences.OnS
|
||||||
ifPackage.addAction(Intent.ACTION_PACKAGE_ADDED);
|
ifPackage.addAction(Intent.ACTION_PACKAGE_ADDED);
|
||||||
ifPackage.addAction(Intent.ACTION_PACKAGE_REMOVED);
|
ifPackage.addAction(Intent.ACTION_PACKAGE_REMOVED);
|
||||||
ifPackage.addDataScheme("package");
|
ifPackage.addDataScheme("package");
|
||||||
registerReceiver(packageChangedReceiver, ifPackage);
|
ContextCompat.registerReceiver(this, packageChangedReceiver, ifPackage, ContextCompat.RECEIVER_NOT_EXPORTED);
|
||||||
registeredPackageChanged = true;
|
registeredPackageChanged = true;
|
||||||
|
|
||||||
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M)
|
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M)
|
||||||
|
@ -2589,7 +2589,7 @@ public class ServiceSinkhole extends VpnService implements SharedPreferences.OnS
|
||||||
Log.i(TAG, "Starting listening to connectivity changes");
|
Log.i(TAG, "Starting listening to connectivity changes");
|
||||||
IntentFilter ifConnectivity = new IntentFilter();
|
IntentFilter ifConnectivity = new IntentFilter();
|
||||||
ifConnectivity.addAction(ConnectivityManager.CONNECTIVITY_ACTION);
|
ifConnectivity.addAction(ConnectivityManager.CONNECTIVITY_ACTION);
|
||||||
registerReceiver(connectivityChangedReceiver, ifConnectivity);
|
ContextCompat.registerReceiver(this, connectivityChangedReceiver, ifConnectivity, ContextCompat.RECEIVER_NOT_EXPORTED);
|
||||||
registeredConnectivityChanged = true;
|
registeredConnectivityChanged = true;
|
||||||
|
|
||||||
// Listen for phone state changes
|
// Listen for phone state changes
|
||||||
|
|
Loading…
Reference in New Issue