Fixes
This commit is contained in:
parent
03b0a6f00d
commit
75854c1122
|
|
@ -31,7 +31,7 @@ android {
|
||||||
minSdkVersion 26
|
minSdkVersion 26
|
||||||
//noinspection OldTargetApi
|
//noinspection OldTargetApi
|
||||||
targetSdkVersion 27
|
targetSdkVersion 27
|
||||||
versionCode 45600
|
versionCode 45611
|
||||||
versionName "4.5.6.1"
|
versionName "4.5.6.1"
|
||||||
signingConfig signingConfigs.release
|
signingConfig signingConfigs.release
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -8,6 +8,8 @@ import androidx.appcompat.widget.PopupMenu;
|
||||||
import androidx.appcompat.widget.TooltipCompat;
|
import androidx.appcompat.widget.TooltipCompat;
|
||||||
import androidx.core.content.ContextCompat;
|
import androidx.core.content.ContextCompat;
|
||||||
|
|
||||||
|
import org.meowcat.edxposed.manager.adapters.AppHelper;
|
||||||
|
import org.meowcat.edxposed.manager.adapters.BlackListAdapter;
|
||||||
import org.meowcat.edxposed.manager.databinding.ActivityMainBinding;
|
import org.meowcat.edxposed.manager.databinding.ActivityMainBinding;
|
||||||
import org.meowcat.edxposed.manager.util.ModuleUtil;
|
import org.meowcat.edxposed.manager.util.ModuleUtil;
|
||||||
import org.meowcat.edxposed.manager.util.RepoLoader;
|
import org.meowcat.edxposed.manager.util.RepoLoader;
|
||||||
|
|
@ -95,6 +97,7 @@ public class MainActivity extends BaseActivity implements RepoLoader.RepoListene
|
||||||
binding.statusIcon.setImageDrawable(getDrawable(R.drawable.ic_error));
|
binding.statusIcon.setImageDrawable(getDrawable(R.drawable.ic_error));
|
||||||
}
|
}
|
||||||
notifyDataSetChanged();
|
notifyDataSetChanged();
|
||||||
|
new Thread(() -> new BlackListAdapter(getApplicationContext(), AppHelper.isWhiteListMode(), null).generateCheckedList());
|
||||||
}
|
}
|
||||||
|
|
||||||
private int extractIntPart(String str) {
|
private int extractIntPart(String str) {
|
||||||
|
|
|
||||||
|
|
@ -19,6 +19,7 @@ import androidx.appcompat.app.AppCompatActivity;
|
||||||
import androidx.preference.PreferenceManager;
|
import androidx.preference.PreferenceManager;
|
||||||
import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
|
import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
|
||||||
|
|
||||||
|
import org.meowcat.edxposed.manager.adapters.AppHelper;
|
||||||
import org.meowcat.edxposed.manager.receivers.PackageChangeReceiver;
|
import org.meowcat.edxposed.manager.receivers.PackageChangeReceiver;
|
||||||
import org.meowcat.edxposed.manager.util.ModuleUtil;
|
import org.meowcat.edxposed.manager.util.ModuleUtil;
|
||||||
import org.meowcat.edxposed.manager.util.NotificationUtil;
|
import org.meowcat.edxposed.manager.util.NotificationUtil;
|
||||||
|
|
@ -30,6 +31,7 @@ import java.io.StringWriter;
|
||||||
import java.lang.reflect.Method;
|
import java.lang.reflect.Method;
|
||||||
import java.text.DateFormat;
|
import java.text.DateFormat;
|
||||||
import java.text.SimpleDateFormat;
|
import java.text.SimpleDateFormat;
|
||||||
|
import java.util.Collection;
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
import java.util.Objects;
|
import java.util.Objects;
|
||||||
|
|
||||||
|
|
@ -122,6 +124,16 @@ public class XposedApp extends de.robv.android.xposed.installer.XposedApp implem
|
||||||
|
|
||||||
pref = PreferenceManager.getDefaultSharedPreferences(this);
|
pref = PreferenceManager.getDefaultSharedPreferences(this);
|
||||||
|
|
||||||
|
if (pref.getBoolean("hook_modules", true)) {
|
||||||
|
Collection<ModuleUtil.InstalledModule> installedModules = ModuleUtil.getInstance().getModules().values();
|
||||||
|
for (ModuleUtil.InstalledModule info : installedModules) {
|
||||||
|
if (!AppHelper.FORCE_WHITE_LIST_MODULE.contains(info.packageName)) {
|
||||||
|
AppHelper.FORCE_WHITE_LIST_MODULE.add(info.packageName);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Log.d(TAG, "ApplicationList: Force add modules to list");
|
||||||
|
}
|
||||||
|
|
||||||
de.robv.android.xposed.installer.XposedApp.getInstance().reloadXposedProp();
|
de.robv.android.xposed.installer.XposedApp.getInstance().reloadXposedProp();
|
||||||
createDirectories();
|
createDirectories();
|
||||||
NotificationUtil.init();
|
NotificationUtil.init();
|
||||||
|
|
|
||||||
|
|
@ -45,7 +45,7 @@ public class AppHelper {
|
||||||
private static final String BLACK_LIST_MODE = "conf/blackwhitelist";
|
private static final String BLACK_LIST_MODE = "conf/blackwhitelist";
|
||||||
|
|
||||||
private static final List<String> FORCE_WHITE_LIST = new ArrayList<>(Collections.singletonList(BuildConfig.APPLICATION_ID));
|
private static final List<String> FORCE_WHITE_LIST = new ArrayList<>(Collections.singletonList(BuildConfig.APPLICATION_ID));
|
||||||
static List<String> FORCE_WHITE_LIST_MODULE = new ArrayList<>(FORCE_WHITE_LIST);
|
public static List<String> FORCE_WHITE_LIST_MODULE = new ArrayList<>(FORCE_WHITE_LIST);
|
||||||
|
|
||||||
@SuppressWarnings("OctalInteger")
|
@SuppressWarnings("OctalInteger")
|
||||||
static void makeSurePath() {
|
static void makeSurePath() {
|
||||||
|
|
|
||||||
|
|
@ -25,7 +25,7 @@ public class BlackListAdapter extends AppAdapter {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected List<String> generateCheckedList() {
|
public List<String> generateCheckedList() {
|
||||||
if (XposedApp.getPreferences().getBoolean("hook_modules", true)) {
|
if (XposedApp.getPreferences().getBoolean("hook_modules", true)) {
|
||||||
Collection<ModuleUtil.InstalledModule> installedModules = ModuleUtil.getInstance().getModules().values();
|
Collection<ModuleUtil.InstalledModule> installedModules = ModuleUtil.getInstance().getModules().values();
|
||||||
for (ModuleUtil.InstalledModule info : installedModules) {
|
for (ModuleUtil.InstalledModule info : installedModules) {
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue