WeiguangTWK
/
LSPosed
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Minor fixes

This commit is contained in:
NekoInverter 2020-05-26 10:40:43 +08:00
parent f2b12a36ac
commit b950475d48
No known key found for this signature in database
GPG Key ID: 280D6CCCF95715F9
20 changed files with 36 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

@ -30,8 +30,8 @@ android {
minSdkVersion 26
//noinspection OldTargetApi
targetSdkVersion 27
versionCode 457030
versionName "4.5.7.3"
versionCode 457040
versionName "4.5.7.4"
signingConfig signingConfigs.release
}
buildTypes {

1
app/src/main/java/org/meowcat/edxposed/manager/AboutActivity.java
View File

@ -2,7 +2,6 @@ package org.meowcat.edxposed.manager;
import android.content.Intent;
import android.content.SharedPreferences;
import android.content.pm.PackageManager;
import android.os.Bundle;
import android.view.View;

14
app/src/main/java/org/meowcat/edxposed/manager/BaseAdvancedInstaller.java
View File

@ -87,7 +87,7 @@ public class BaseAdvancedInstaller extends Fragment {
Uri uri = Uri.parse(selectedInstaller.link);
Intent intent = new Intent(Intent.ACTION_VIEW, uri);
startActivity(intent);
}));
}, tab.description));
binding.btnUninstall.setOnClickListener(v -> warningArchitecture(
(dialog, which) -> {
@ -95,7 +95,7 @@ public class BaseAdvancedInstaller extends Fragment {
Uri uri = Uri.parse(selectedUninstaller.link);
Intent intent = new Intent(Intent.ACTION_VIEW, uri);
startActivity(intent);
}));
}, tab.description));
binding.noticeTv.setText(HtmlCompat.fromHtml(tab.notice, HtmlCompat.FROM_HTML_MODE_LEGACY));
binding.author.setText(getString(R.string.download_author, tab.author));
@ -126,12 +126,18 @@ public class BaseAdvancedInstaller extends Fragment {
return binding.getRoot();
}
private void warningArchitecture(DialogInterface.OnClickListener listener) {
private void warningArchitecture(DialogInterface.OnClickListener listener, String description) {
Activity activity = getActivity();
StringBuilder sb = new StringBuilder();
sb.append(getString(R.string.warningArchitecture));
sb.append("\n\n");
sb.append(getString(R.string.changes));
sb.append("\n");
sb.append(HtmlCompat.fromHtml(description, HtmlCompat.FROM_HTML_MODE_LEGACY));
if (activity != null) {
new MaterialAlertDialogBuilder(activity)
.setTitle(R.string.areyousure)
.setMessage(R.string.warningArchitecture)
.setMessage(sb.toString())
.setPositiveButton(android.R.string.yes, listener)
.setNegativeButton(android.R.string.no, null)
.show();

2
app/src/main/java/org/meowcat/edxposed/manager/EdDownloadActivity.java
View File

@ -49,9 +49,9 @@ public class EdDownloadActivity extends BaseActivity {
if (!XposedApp.getPreferences().getBoolean("hide_install_warning", false)) {
DialogInstallWarningBinding binding = DialogInstallWarningBinding.inflate(getLayoutInflater());
binding.message.setText(R.string.not_logcat);
new MaterialAlertDialogBuilder(this)
.setTitle(R.string.install_warning_title)
.setMessage(R.string.install_warning)
.setView(binding.getRoot())
.setPositiveButton(android.R.string.ok, (dialog, which) -> {
if (binding.checkbox.isChecked())

2
app/src/main/java/org/meowcat/edxposed/manager/LogsActivity.java
View File

@ -65,9 +65,9 @@ public class LogsActivity extends BaseActivity {
if (!XposedApp.getPreferences().getBoolean("hide_logcat_warning", false)) {
DialogInstallWarningBinding binding = DialogInstallWarningBinding.inflate(getLayoutInflater());
binding.message.setText(R.string.not_logcat);
new MaterialAlertDialogBuilder(this)
.setTitle(R.string.install_warning_title)
.setMessage(R.string.not_logcat)
.setView(binding.getRoot())
.setPositiveButton(android.R.string.ok, (dialog, which) -> {
if (binding.checkbox.isChecked())

2
app/src/main/java/org/meowcat/edxposed/manager/MainActivity.java
View File

@ -14,8 +14,6 @@ import org.meowcat.edxposed.manager.databinding.ActivityMainBinding;
import org.meowcat.edxposed.manager.util.ModuleUtil;
import org.meowcat.edxposed.manager.util.RepoLoader;
import me.zhanghai.android.appiconloader.AppIconLoader;
public class MainActivity extends BaseActivity implements RepoLoader.RepoListener, ModuleUtil.ModuleListener {
ActivityMainBinding binding;
private RepoLoader repoLoader;

4
app/src/main/java/org/meowcat/edxposed/manager/XposedApp.java
View File

@ -148,10 +148,10 @@ public class XposedApp extends de.robv.android.xposed.installer.XposedApp implem
RepoLoader.getInstance().triggerFirstLoadIfNecessary();
appIconLoader = new AppIconLoader(getResources().getDimensionPixelSize(
R.dimen.app_icon_size), this);
R.dimen.app_icon_size), false, this);
}
public AppIconLoader getAppIconLoader(){
public AppIconLoader getAppIconLoader() {
return appIconLoader;
}

2
app/src/main/java/org/meowcat/edxposed/manager/adapters/AppAdapter.java
View File

@ -33,8 +33,6 @@ import java.util.Date;
import java.util.List;
import java.util.Locale;
import me.zhanghai.android.appiconloader.AppIconLoader;
public class AppAdapter extends RecyclerView.Adapter<AppAdapter.ViewHolder> implements Filterable {
protected final Context context;

1
app/src/main/java/org/meowcat/edxposed/manager/adapters/AppHelper.java
View File

@ -18,7 +18,6 @@ import androidx.fragment.app.FragmentManager;
import org.meowcat.edxposed.manager.BuildConfig;
import org.meowcat.edxposed.manager.R;
import org.meowcat.edxposed.manager.StatusInstallerFragment;
import org.meowcat.edxposed.manager.XposedApp;
import org.meowcat.edxposed.manager.util.CompileUtil;

2
app/src/main/java/org/meowcat/edxposed/manager/receivers/BootReceiver.java
View File

@ -3,8 +3,6 @@ package org.meowcat.edxposed.manager.receivers;
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
import android.net.ConnectivityManager;
import android.net.NetworkInfo;
import android.os.AsyncTask;
import android.util.Log;

6
app/src/main/java/org/meowcat/edxposed/manager/util/ModuleUtil.java
View File

@ -1,13 +1,11 @@
package org.meowcat.edxposed.manager.util;
import android.content.Context;
import android.content.Intent;
import android.content.SharedPreferences;
import android.content.pm.ApplicationInfo;
import android.content.pm.PackageInfo;
import android.content.pm.PackageManager;
import android.content.pm.PackageManager.NameNotFoundException;
import android.content.pm.ResolveInfo;
import android.graphics.Bitmap;
import android.graphics.drawable.Drawable;
import android.os.Build;
@ -33,13 +31,11 @@ import java.util.List;
import java.util.Map;
import java.util.concurrent.CopyOnWriteArrayList;
import me.zhanghai.android.appiconloader.AppIconLoader;
@SuppressWarnings("OctalInteger")
public final class ModuleUtil {
private static final String PLAY_STORE_PACKAGE = "com.android.vending";
// xposedminversion below this
public static String MODULES_LIST_FILE = XposedApp.BASE_DIR + "conf/modules.list";
private static final String PLAY_STORE_PACKAGE = "com.android.vending";
public static int MIN_MODULE_VERSION = 2; // reject modules with
private static ModuleUtil instance = null;
private final PackageManager pm;

5
app/src/main/java/org/meowcat/edxposed/manager/xposed/Enhancement.java
View File

@ -12,8 +12,6 @@ import android.util.SparseArray;
import androidx.annotation.Keep;
import androidx.annotation.Nullable;
import org.meowcat.edxposed.manager.StatusInstallerFragment;
import java.io.BufferedReader;
import java.io.File;
import java.io.FileReader;
@ -29,6 +27,7 @@ import de.robv.android.xposed.XC_MethodReplacement;
import de.robv.android.xposed.XposedBridge;
import de.robv.android.xposed.XposedHelpers;
import de.robv.android.xposed.callbacks.XC_LoadPackage;
import de.robv.android.xposed.installer.XposedApp;
import static de.robv.android.xposed.XposedHelpers.callMethod;
import static de.robv.android.xposed.XposedHelpers.callStaticMethod;
@ -347,7 +346,7 @@ public class Enhancement implements IXposedHookLoadPackage {
}
} else if (lpparam.packageName.equals(APPLICATION_ID)) {
// Make sure Xposed work
XposedHelpers.findAndHookMethod(StatusInstallerFragment.class.getName(), lpparam.classLoader, "isEnhancementEnabled", XC_MethodReplacement.returnConstant(true));
XposedHelpers.findAndHookMethod(XposedApp.class.getName(), lpparam.classLoader, "isEnhancementEnabled", XC_MethodReplacement.returnConstant(true));
// XposedHelpers.findAndHookMethod(StatusInstallerFragment.class.getName(), lpparam.classLoader, "isSELinuxEnforced", XC_MethodReplacement.returnConstant(SELinuxHelper.isSELinuxEnforced()));
}
}

6
app/src/main/res/layout/activity_about.xml
View File

@ -26,10 +26,10 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="72dp"
android:orientation="horizontal"
android:padding="16dp"
android:clipChildren="false"
android:clipToPadding="false">
android:clipToPadding="false"
android:orientation="horizontal"
android:padding="16dp">
<ImageView
android:id="@+id/app_icon"

30
app/src/main/res/layout/dialog_install_warning.xml
View File

@ -1,26 +1,14 @@
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="12dp">
android:layout_height="match_parent"
android:orientation="vertical">
<LinearLayout
<com.google.android.material.checkbox.MaterialCheckBox
android:id="@+id/checkbox"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
android:layout_marginLeft="?attr/dialogPreferredPadding"
android:layout_marginRight="?attr/dialogPreferredPadding"
android:text="@string/dont_show_again" />
<TextView
android:id="@android:id/message"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/install_warning"
android:textSize="16sp" />
<com.google.android.material.checkbox.MaterialCheckBox
android:id="@android:id/checkbox"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/dont_show_again" />
</LinearLayout>
</ScrollView>
</LinearLayout>

4
app/src/main/res/values-night/colors_md2.xml Normal file
View File

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="selectorTransparency_md2">#e5ffffff</color>
</resources>

6
app/src/main/res/values-zh-rCN/strings.xml
View File

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
<string name="action_settings">设置</string>
<string name="Activated">已激活</string>
<string name="Inactivate">未激活</string>
<string name="Install">安装</string>
@ -200,7 +199,6 @@
<string name="reboot_edl">重启至救援模式</string>
<string name="loading">正在加载…</string>
<string name="scroll_bottom">滚动到底部</string>
<string name="confirm_reboots">重启确认</string>
<string name="skip_xposedminversion_check">关闭状态检查</string>
<string name="skip_xposedminversion_check_summ">关闭针对模块的"EdXposed 安装状态"检查</string>
<string name="support_xda">获取帮助</string>
@ -249,8 +247,6 @@
<string name="install_load_apk">正在安装 %s</string>
<string name="unstable_build">这是一个不稳定的构建\n安装风险由您自行承担</string>
<string name="unofficial_build">这是一个非官方的构建\n安装风险由您自行承担</string>
<string name="alt_download_method">备用下载方法</string>
<string name="alt_download_method_summ">如果下载模块时出现问题, 请开启此选项</string>
<string name="dexopt_now">以 Dexopt 模式优化全部应用</string>
<string name="speed_now">以 Speed 模式优化全部应用</string>
<string name="this_may_take_a_while">请稍后, 这将需要一段时间…</string>
@ -272,8 +268,6 @@
<string name="custom_list">使用镜像化的模块列表</string>
<string name="custom_list_summ">镜像化的模块列表可以帮助加速加载\n但新提交的模块显示会有延迟(大约24小时)</string>
<string name="not_installed">未安装</string>
<string name="pass_safetynet">通过 SafetyNet 校验</string>
<string name="pass_safetynet_summary">强制将 GMS 和 GSF 加入黑名单并移出白名单\n关闭此选项并不会移除已勾选的应用标识\n仅当启用应用名单模式时有效</string>
<string name="support_group_telegram_channel">Telegram 频道: @EdXposed</string>
<string name="warning_list_not_enabled">应用名单模式未启用，您可以在设置中启用</string>
<string name="empty_param">参数为空</string>

6
app/src/main/res/values-zh-rHK/strings.xml
View File

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
<string name="action_settings">設置</string>
<string name="Activated">已激活</string>
<string name="Inactivate">未激活</string>
<string name="Install">安裝</string>
@ -200,7 +199,6 @@
<string name="reboot_edl">重啟至救援模式</string>
<string name="loading">正在加載…</string>
<string name="scroll_bottom">滾動到底部</string>
<string name="confirm_reboots">重啟確認</string>
<string name="skip_xposedminversion_check">關閉狀態檢查</string>
<string name="skip_xposedminversion_check_summ">關閉針對模塊的"EdXposed 安裝狀態"檢查</string>
<string name="support_xda">獲取幫助</string>
@ -249,8 +247,6 @@
<string name="install_load_apk">正在安裝 %s</string>
<string name="unstable_build">這是一個不穩定的構建\n安裝風險由您自行承擔</string>
<string name="unofficial_build">這是一個非官方的構建\n安裝風險由您自行承擔</string>
<string name="alt_download_method">備用下載方法</string>
<string name="alt_download_method_summ">如果下載模塊時出現問題, 請開啟此選項</string>
<string name="dexopt_now">以 Dexopt 模式優化全部應用</string>
<string name="speed_now">以 Speed 模式優化全部應用</string>
<string name="this_may_take_a_while">請稍後, 這將需要一段時間…</string>
@ -271,8 +267,6 @@
<string name="custom_list">使用鏡像化的模塊列表</string>
<string name="custom_list_summ">鏡像化的模塊列表可以幫助加速加載\n但新提交的模塊顯示會有延遲(大約24小時)</string>
<string name="not_installed">未安裝</string>
<string name="pass_safetynet">通過 SafetyNet 校驗</string>
<string name="pass_safetynet_summary">強制將 GMS 和 GSF 加入黑名單並移出白名單\n關閉此選項並不會移除已勾選的應用標識\n僅當啟用應用名單模式時有效</string>
<string name="support_group_telegram_channel">Telegram 頻道: @EdXposed</string>
<string name="warning_list_not_enabled">應用名單模式未啟用，您可以在設置中啟用</string>
<string name="empty_param">參數為空</string>

6
app/src/main/res/values-zh-rTW/strings.xml
View File

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
<string name="action_settings">設定</string>
<string name="Activated">已啟用</string>
<string name="Inactivate">未啟用</string>
<string name="Install">安裝</string>
@ -200,7 +199,6 @@
<string name="reboot_edl">重啟至救援模式</string>
<string name="loading">正在載入…</string>
<string name="scroll_bottom">滾動到底部</string>
<string name="confirm_reboots">重啟確認</string>
<string name="skip_xposedminversion_check">關閉狀態檢查</string>
<string name="skip_xposedminversion_check_summ">關閉針對模組的"EdXposed 安裝狀態"檢查</string>
<string name="support_xda">獲取幫助</string>
@ -249,8 +247,6 @@
<string name="install_load_apk">正在安裝 %s</string>
<string name="unstable_build">這是一個不穩定的構建\n安裝風險由您自行承擔</string>
<string name="unofficial_build">這是一個非官方的構建\n安裝風險由您自行承擔</string>
<string name="alt_download_method">備用下載方法</string>
<string name="alt_download_method_summ">如果下載模組時出現問題, 請開啟此選項</string>
<string name="dexopt_now">以 Dexopt 模式優化全部應用</string>
<string name="speed_now">以 Speed 模式優化全部應用</string>
<string name="this_may_take_a_while">請稍後, 這將需要一段時間…</string>
@ -271,8 +267,6 @@
<string name="custom_list">使用映象化的模組列表</string>
<string name="custom_list_summ">映象化的模組列表可以幫助加速載入\n但新提交的模組顯示會有延遲(大約24小時)</string>
<string name="not_installed">未安裝</string>
<string name="pass_safetynet">通過 SafetyNet 校驗</string>
<string name="pass_safetynet_summary">強制將 GMS 和 GSF 加入黑名單並移出白名單\n關閉此選項並不會移除已勾選的應用標識\n僅當啟用應用名單模式時有效</string>
<string name="support_group_telegram_channel">Telegram 頻道: @EdXposed</string>
<string name="warning_list_not_enabled">應用名單模式未啟用，您可以在設定中啟用</string>
<string name="empty_param">引數為空</string>

2
app/src/main/res/values/colors_md2.xml
View File

@ -6,5 +6,5 @@
<color name="colorAccent_md2">@color/material_blue_700</color>
<color name="colorActionBar_md2">#fff</color>
<color name="colorStickyHeader_md2">#eaffffff</color>
<color name="selectorTransparency_md2">#3dffffff</color>
<color name="selectorTransparency_md2">#1affffff</color>
</resources>

6
app/src/main/res/values/strings.xml
View File

@ -1,6 +1,5 @@
<resources>
<string name="app_name" translatable="false">EdXposed Manager</string>
<string name="action_settings">Settings</string>
<string name="Activated">Activated</string>
<string name="Inactivate">Inactivate</string>
<string name="Install">Install</string>
@ -202,7 +201,6 @@
<string name="reboot_edl">Reboot to Emergency</string>
<string name="loading">Loading…</string>
<string name="scroll_bottom">Scroll to bottom</string>
<string name="confirm_reboots">Confirm reboots</string>
<string name="skip_xposedminversion_check">Skip status check</string>
<string name="skip_xposedminversion_check_summ">Skip \"EdXposed Status\" check for modules</string>
@ -221,8 +219,6 @@
<string name="unstable_build">This is a unstable build\nInstall it at your own risk</string>
<string name="unofficial_build">This is a unofficial build\nInstall it at your own risk</string>
<string name="alt_download_method">Alternative download method</string>
<string name="alt_download_method_summ">Check this option if you get issues when downloading a module</string>
<string name="custom_list">Use mirrored modules list</string>
<string name="custom_list_summ">Mirrored modules list can help load faster\nBut the newly submitted module display will be delayed (about 24 hours)</string>
@ -304,8 +300,6 @@
<string name="hook_modules">Force hook modules</string>
<string name="hook_modules_summary">Force add modules to white-list and remove from black list\nClosing this option does not remove modules from white list\nApp list mode is required to enable</string>
<string name="not_installed">Not installed</string>
<string name="pass_safetynet">Pass SafetyNet</string>
<string name="pass_safetynet_summary">Force add GMS and GSF to black list and remove from white list\nClosing this option does not remove modules from black list\nApp list mode is required to enable</string>
<string name="support_group_telegram_channel">Telegram Channel: @EdXposed</string>
<string name="warning_list_not_enabled">Application list mode is not enabled, you can enable in settings</string>
<string name="empty_param">Params empty</string>