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

[app] Fix preload HTMLs again (#1094)

This commit is contained in:
tehcneko 2021-09-10 15:59:54 +08:00 committed by GitHub
parent f05bbc5cd9
commit b3c9694c75
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 26 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
app/src/main/java/org/lsposed/manager/App.java
View File

@ -40,15 +40,18 @@ import org.lsposed.manager.ui.activity.CrashReportActivity;
import org.lsposed.manager.util.DoHDNS;
import org.lsposed.manager.util.theme.ThemeUtil;
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.IOException;
import java.io.PrintWriter;
import java.io.StringWriter;
import java.nio.charset.StandardCharsets;
import java.time.Instant;
import java.time.ZoneOffset;
import java.util.Locale;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.FutureTask;
import okhttp3.Cache;
import okhttp3.Call;
@ -61,6 +64,23 @@ import rikka.material.app.DayNightDelegate;
import rikka.material.app.LocaleDelegate;
public class App extends Application {
public static final FutureTask<String> HTML_TEMPLATE = new FutureTask<>(() -> readWebviewHTML("template.html"));
public static final FutureTask<String> HTML_TEMPLATE_DARK = new FutureTask<>(() -> readWebviewHTML("template_dark.html"));
private static String readWebviewHTML(String name) {
try {
var input = App.getInstance().getAssets().open("webview/" + name);
var result = new ByteArrayOutputStream(1024);
var buffer = new byte[1024];
for (int length; (length = input.read(buffer)) != -1; ) {
result.write(buffer, 0, length);
}
return result.toString(StandardCharsets.UTF_8.name());
} catch (IOException e) {
Log.e(App.TAG, "read webview HTML", e);
return "<html><body>@body@</body></html>";
}
}
static {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
@ -136,6 +156,9 @@ public class App extends Application {
loadRemoteVersion();
RepoLoader.getInstance().loadRemoteData();
executorService.submit(HTML_TEMPLATE);
executorService.submit(HTML_TEMPLATE_DARK);
}
@NonNull

31
app/src/main/java/org/lsposed/manager/ui/fragment/RepoFragment.java
View File

@ -30,7 +30,6 @@ import android.text.TextUtils;
import android.text.style.ForegroundColorSpan;
import android.text.style.StyleSpan;
import android.text.style.TypefaceSpan;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.Menu;
import android.view.MenuItem;
@ -59,16 +58,12 @@ import org.lsposed.manager.repo.RepoLoader;
import org.lsposed.manager.repo.model.OnlineModule;
import org.lsposed.manager.util.ModuleUtil;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.time.Instant;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
import java.util.concurrent.FutureTask;
import java.util.stream.Collectors;
import rikka.core.util.LabelComparator;
@ -76,8 +71,6 @@ import rikka.core.util.ResourceUtils;
import rikka.recyclerview.RecyclerViewKt;
public class RepoFragment extends BaseFragment implements RepoLoader.Listener {
public static final FutureTask<String> HTML_TEMPLATE = new FutureTask<>(() -> readWebviewHTML("template.html"));
public static final FutureTask<String> HTML_TEMPLATE_DARK = new FutureTask<>(() -> readWebviewHTML("template_dark.html"));
protected FragmentRepoBinding binding;
protected SearchView searchView;
private SearchView.OnQueryTextListener mSearchListener;
@ -87,28 +80,8 @@ public class RepoFragment extends BaseFragment implements RepoLoader.Listener {
private final RepoLoader repoLoader = RepoLoader.getInstance();
private RepoAdapter adapter;
private static String readWebviewHTML(String name) {
try {
var input = App.getInstance().getAssets().open("webview/" + name);
var result = new ByteArrayOutputStream(1024);
var buffer = new byte[1024];
for (int length; (length = input.read(buffer)) != -1; ) {
result.write(buffer, 0, length);
}
return result.toString(StandardCharsets.UTF_8.name());
} catch (IOException e) {
Log.e(App.TAG, "read webview HTML", e);
return "<html><body>@body@</body></html>";
}
}
@Override
public void onCreate(@Nullable Bundle savedInstanceState) {
if (ResourceUtils.isNightMode(getResources().getConfiguration())) {
runAsync(HTML_TEMPLATE_DARK);
} else {
runAsync(HTML_TEMPLATE);
}
mSearchListener = new SearchView.OnQueryTextListener() {
@Override
public boolean onQueryTextSubmit(String query) {
@ -169,9 +142,7 @@ public class RepoFragment extends BaseFragment implements RepoLoader.Listener {
super.onResume();
adapter.initData();
if (preLoadWebview) {
mHandler.postDelayed(() -> {
new WebView(requireContext());
}, 500);
mHandler.postDelayed(() -> new WebView(requireContext()), 500);
preLoadWebview = false;
}
}

4
app/src/main/java/org/lsposed/manager/ui/fragment/RepoItemFragment.java
View File

@ -151,9 +151,9 @@ public class RepoItemFragment extends BaseFragment implements RepoLoader.Listene
setting.setTextZoom(80);
String body;
if (ResourceUtils.isNightMode(getResources().getConfiguration())) {
body = RepoFragment.HTML_TEMPLATE_DARK.get().replace("@body@", text);
body = App.HTML_TEMPLATE_DARK.get().replace("@body@", text);
} else {
body = RepoFragment.HTML_TEMPLATE.get().replace("@body@", text);
body = App.HTML_TEMPLATE.get().replace("@body@", text);
}
view.setWebViewClient(new WebViewClient() {
@Override