Commit c553312f authored by d8ahazard's avatar d8ahazard Committed by topjohnwu

Re-add activity check

Causes false disables otherwise.
parent 3adc7ca2
...@@ -7,6 +7,7 @@ import android.app.PendingIntent; ...@@ -7,6 +7,7 @@ import android.app.PendingIntent;
import android.content.ComponentName; import android.content.ComponentName;
import android.content.Intent; import android.content.Intent;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import android.content.pm.ActivityInfo;
import android.content.pm.ApplicationInfo; import android.content.pm.ApplicationInfo;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.os.Build; import android.os.Build;
...@@ -61,23 +62,35 @@ public class MonitorService extends AccessibilityService { ...@@ -61,23 +62,35 @@ public class MonitorService extends AccessibilityService {
event.getPackageName().toString(), event.getPackageName().toString(),
event.getClassName().toString() event.getClassName().toString()
); );
Logger.dh("MonitorService: CurrentActivity: " + event.getPackageName()); ActivityInfo activityInfo = tryGetActivity(componentName);
boolean isActivity = activityInfo != null;
String mPackage = componentName.getPackageName(); if (isActivity) {
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getApplicationContext()); Logger.dh("MonitorService: CurrentActivity: " + event.getPackageName());
if (Utils.autoToggleEnabled(getApplicationContext())) {
Set<String> setBlackList = prefs.getStringSet("auto_blacklist", null); String mPackage = componentName.getPackageName();
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
if (setBlackList != null) { if (Utils.autoToggleEnabled(getApplicationContext())) {
disableroot = setBlackList.contains(mPackage); Set<String> setBlackList = prefs.getStringSet("auto_blacklist", null);
ForceRoot(!disableroot);
String appFriendly = getAppName(mPackage); if (setBlackList != null) {
ShowNotification(disableroot, appFriendly); disableroot = setBlackList.contains(mPackage);
ForceRoot(!disableroot);
String appFriendly = getAppName(mPackage);
ShowNotification(disableroot, appFriendly);
}
} }
} }
} }
} }
private ActivityInfo tryGetActivity(ComponentName componentName) {
try {
return getPackageManager().getActivityInfo(componentName, 0);
} catch (PackageManager.NameNotFoundException e) {
return null;
}
}
private String getAppName(String packageName) { private String getAppName(String packageName) {
PackageManager pkManager = getPackageManager(); PackageManager pkManager = getPackageManager();
ApplicationInfo appInfo; ApplicationInfo appInfo;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment